Merge with 2.0.0-m3

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModifyCommand.java

@@ -8,9 +8,8 @@ import org.eclipse.jgit.attributes.FilterCommandRegistry;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.BadRequestException;
 import sonia.scm.ConcurrentModificationException;
-import sonia.scm.ContextEntry;
+import sonia.scm.NoChangesMadeException;
 import sonia.scm.repository.GitWorkdirFactory;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Repository;
@@ -18,18 +17,10 @@ import sonia.scm.web.lfs.LfsBlobStoreFactory;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.concurrent.locks.Lock;
 
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-import static sonia.scm.AlreadyExistsException.alreadyExists;
-import static sonia.scm.ContextEntry.ContextBuilder.entity;
-import static sonia.scm.NotFoundException.notFound;
-
 public class GitModifyCommand extends AbstractGitCommand implements ModifyCommand {
 
   private static final Logger LOG = LoggerFactory.getLogger(GitModifyCommand.class);
@@ -49,7 +40,7 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
     return inClone(clone -> new ModifyWorker(clone, request), workdirFactory, request.getBranch());
   }
 
-  private class ModifyWorker extends GitCloneWorker<String> implements Worker {
+  private class ModifyWorker extends GitCloneWorker<String> implements ModifyWorkerHelper {
 
     private final File workDir;
     private final ModifyCommandRequest request;
@@ -71,39 +62,15 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
       for (ModifyCommandRequest.PartialRequest r : request.getRequests()) {
         r.execute(this);
       }
-      failIfNotChanged(NoChangesMadeException::new);
+      failIfNotChanged(() -> new NoChangesMadeException(repository, ModifyWorker.this.request.getBranch()));
       Optional<RevCommit> revCommit = doCommit(request.getCommitMessage(), request.getAuthor());
       push();
-      return revCommit.orElseThrow(NoChangesMadeException::new).name();
+      return revCommit.orElseThrow(() -> new NoChangesMadeException(repository, ModifyWorker.this.request.getBranch())).name();
     }
 
     @Override
-    public void create(String toBeCreated, File file, boolean overwrite) throws IOException {
-      Path targetFile = new File(workDir, toBeCreated).toPath();
-      createDirectories(targetFile);
-      if (overwrite) {
-        Files.move(file.toPath(), targetFile, REPLACE_EXISTING);
-      } else {
-        try {
-          Files.move(file.toPath(), targetFile);
-        } catch (FileAlreadyExistsException e) {
-          throw alreadyExists(createFileContext(toBeCreated));
-        }
-      }
-
-      addToGitWithLfsSupport(toBeCreated, targetFile);
-    }
-
-    @Override
-    public void modify(String path, File file) throws IOException {
-      Path targetFile = new File(workDir, path).toPath();
-      createDirectories(targetFile);
-      if (!targetFile.toFile().exists()) {
-        throw notFound(createFileContext(path));
-      }
-      Files.move(file.toPath(), targetFile, REPLACE_EXISTING);
-
-      addToGitWithLfsSupport(path, targetFile);
+    public void addFileToScm(String name, Path file) {
+      addToGitWithLfsSupport(name, file);
     }
 
     private void addToGitWithLfsSupport(String path, Path targetFile) {
@@ -132,13 +99,7 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
     }
 
     @Override
-    public void delete(String toBeDeleted) throws IOException {
-      Path fileToBeDeleted = new File(workDir, toBeDeleted).toPath();
-      try {
-        Files.delete(fileToBeDeleted);
-      } catch (NoSuchFileException e) {
-        throw notFound(createFileContext(toBeDeleted));
-      }
+    public void doScmDelete(String toBeDeleted) {
       try {
         getClone().rm().addFilepattern(removeStartingPathSeparators(toBeDeleted)).call();
       } catch (GitAPIException e) {
@@ -146,45 +107,27 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
       }
     }
 
+    @Override
+    public File getWorkDir() {
+      return workDir;
+    }
+
+    @Override
+    public Repository getRepository() {
+      return repository;
+    }
+
+    @Override
+    public String getBranch() {
+      return request.getBranch();
+    }
+
     private String removeStartingPathSeparators(String path) {
       while (path.startsWith(File.separator)) {
         path = path.substring(1);
       }
       return path;
     }
-
-    private void createDirectories(Path targetFile) throws IOException {
-      try {
-        Files.createDirectories(targetFile.getParent());
-      } catch (FileAlreadyExistsException e) {
-        throw alreadyExists(createFileContext(targetFile.toString()));
-      }
-    }
-
-    private ContextEntry.ContextBuilder createFileContext(String path) {
-      ContextEntry.ContextBuilder contextBuilder = entity("file", path);
-      if (!StringUtils.isEmpty(request.getBranch())) {
-        contextBuilder.in("branch", request.getBranch());
-      }
-      contextBuilder.in(context.getRepository());
-      return contextBuilder;
-    }
-
-    @Override
-    public void move(String sourcePath, String targetPath) {
-
-    }
-
-    private class NoChangesMadeException extends BadRequestException {
-      public NoChangesMadeException() {
-        super(ContextEntry.ContextBuilder.entity(context.getRepository()).build(), "no changes detected to branch " + ModifyWorker.this.request.getBranch());
-      }
-
-      @Override
-      public String getCode() {
-        return "40RaYIeeR1";
-      }
-    }
   }
 
   private String throwInternalRepositoryException(String message, Exception e) {

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java

@@ -0,0 +1,103 @@
+package sonia.scm.repository.spi;
+
+import com.aragost.javahg.Changeset;
+import com.aragost.javahg.Repository;
+import com.aragost.javahg.commands.CommitCommand;
+import com.aragost.javahg.commands.ExecutionException;
+import com.aragost.javahg.commands.PullCommand;
+import com.aragost.javahg.commands.RemoveCommand;
+import com.aragost.javahg.commands.StatusCommand;
+import sonia.scm.NoChangesMadeException;
+import sonia.scm.repository.InternalRepositoryException;
+import sonia.scm.repository.util.WorkingCopy;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+public class HgModifyCommand implements ModifyCommand {
+
+  private HgCommandContext context;
+  private final HgWorkdirFactory workdirFactory;
+
+  public HgModifyCommand(HgCommandContext context, HgWorkdirFactory workdirFactory) {
+    this.context = context;
+    this.workdirFactory = workdirFactory;
+  }
+
+  @Override
+  public String execute(ModifyCommandRequest request) {
+
+    try (WorkingCopy<com.aragost.javahg.Repository> workingCopy = workdirFactory.createWorkingCopy(context, request.getBranch())) {
+      Repository workingRepository = workingCopy.getWorkingRepository();
+      request.getRequests().forEach(
+        partialRequest -> {
+          try {
+            partialRequest.execute(new ModifyWorkerHelper() {
+
+              @Override
+              public void addFileToScm(String name, Path file) {
+                try {
+                  addFileToHg(file.toFile());
+                } catch (ExecutionException e) {
+                  throwInternalRepositoryException("could not add new file to index", e);
+                }
+              }
+
+              @Override
+              public void doScmDelete(String toBeDeleted) {
+                RemoveCommand.on(workingRepository).execute(toBeDeleted);
+              }
+
+              @Override
+              public sonia.scm.repository.Repository getRepository() {
+                return context.getScmRepository();
+              }
+
+              @Override
+              public String getBranch() {
+                return request.getBranch();
+              }
+
+              public File getWorkDir() {
+                return workingRepository.getDirectory();
+              }
+
+              private void addFileToHg(File file) {
+                workingRepository.workingCopy().add(file.getAbsolutePath());
+              }
+            });
+          } catch (IOException e) {
+            throwInternalRepositoryException("could not execute command on repository", e);
+          }
+        }
+      );
+      if (StatusCommand.on(workingRepository).lines().isEmpty()) {
+        throw new NoChangesMadeException(context.getScmRepository());
+      }
+      CommitCommand.on(workingRepository).user(String.format("%s <%s>", request.getAuthor().getName(), request.getAuthor().getMail())).message(request.getCommitMessage()).execute();
+      List<Changeset> execute = pullModifyChangesToCentralRepository(request, workingCopy);
+      return execute.get(0).getNode();
+    } catch (ExecutionException e) {
+      throwInternalRepositoryException("could not execute command on repository", e);
+      return null;
+    }
+  }
+
+  private List<Changeset> pullModifyChangesToCentralRepository(ModifyCommandRequest request, WorkingCopy<com.aragost.javahg.Repository> workingCopy) {
+    try {
+      com.aragost.javahg.commands.PullCommand pullCommand = PullCommand.on(workingCopy.getCentralRepository());
+      workdirFactory.configure(pullCommand);
+      return pullCommand.execute(workingCopy.getDirectory().getAbsolutePath());
+    } catch (Exception e) {
+      throw new IntegrateChangesFromWorkdirException(context.getScmRepository(),
+        String.format("Could not pull modify changes from working copy to central repository for branch %s", request.getBranch()),
+        e);
+    }
+  }
+
+  private String throwInternalRepositoryException(String message, Exception e) {
+    throw new InternalRepositoryException(context.getScmRepository(), message, e);
+  }
+}

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java

@@ -66,7 +66,8 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider
     Command.INCOMING,
     Command.OUTGOING,
     Command.PUSH,
-    Command.PULL
+    Command.PULL,
+    Command.MODIFY
   );
   //J+
 
@@ -77,7 +78,7 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider
   //~--- constructors ---------------------------------------------------------
 
   HgRepositoryServiceProvider(HgRepositoryHandler handler,
-    HgHookManager hookManager, Repository repository)
+                              HgHookManager hookManager, Repository repository)
   {
     this.repository = repository;
     this.handler = handler;
@@ -238,6 +239,11 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider
     return new HgPushCommand(handler, context, repository);
   }
 
+  @Override
+  public ModifyCommand getModifyCommand() {
+    return new HgModifyCommand(context, handler.getWorkdirFactory());
+  }
+
   /**
    * Method description
    *

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java

@@ -47,12 +47,12 @@ import sonia.scm.repository.Repository;
 public class HgRepositoryServiceResolver implements RepositoryServiceResolver
 {
 
-  private HgRepositoryHandler handler;
-  private HgHookManager hookManager;
+  private final HgRepositoryHandler handler;
+  private final HgHookManager hookManager;
 
   @Inject
   public HgRepositoryServiceResolver(HgRepositoryHandler handler,
-    HgHookManager hookManager)
+                                     HgHookManager hookManager)
   {
     this.handler = handler;
     this.hookManager = hookManager;

scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg/ext/fileview.py

@@ -1,8 +1,8 @@
 #
 # Copyright (c) 2010, Sebastian Sdorra
-# All rights reserved.
+# aLL rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
+# rEDistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
 # 1. Redistributions of source code must retain the above copyright notice,
@@ -34,7 +34,7 @@ Prints date, size and last message of files.
 """
 
 from collections import defaultdict
-from mercurial import cmdutil,util
+from mercurial import scmutil
 
 cmdtable = {}
 
@@ -122,7 +122,7 @@ class File_Object:
     return result
 
 class File_Walker:
-  
+
   def __init__(self, sub_repositories, visitor):
     self.visitor = visitor
     self.sub_repositories = sub_repositories
@@ -273,7 +273,7 @@ class File_Viewer:
     ('t', 'transport', False, 'format the output for command server'),
   ])
 def fileview(ui, repo, **opts):
-  revCtx = repo[opts["revision"]]
+  revCtx = scmutil.revsingle(repo, opts["revision"])
   subrepos = {}
   if not opts["disableSubRepositoryDetection"]:
     subrepos = collect_sub_repositories(revCtx)

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgModifyCommandTest.java

@@ -0,0 +1,164 @@
+package sonia.scm.repository.spi;
+
+import com.google.inject.util.Providers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import sonia.scm.AlreadyExistsException;
+import sonia.scm.NoChangesMadeException;
+import sonia.scm.NotFoundException;
+import sonia.scm.repository.HgHookManager;
+import sonia.scm.repository.HgTestUtil;
+import sonia.scm.repository.Person;
+import sonia.scm.repository.util.WorkdirProvider;
+import sonia.scm.web.HgRepositoryEnvironmentBuilder;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class HgModifyCommandTest extends AbstractHgCommandTestBase {
+
+  private HgModifyCommand hgModifyCommand;
+
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  @Before
+  public void initHgModifyCommand() {
+    HgHookManager hookManager = HgTestUtil.createHookManager();
+    HgRepositoryEnvironmentBuilder environmentBuilder = new HgRepositoryEnvironmentBuilder(handler, hookManager);
+    SimpleHgWorkdirFactory workdirFactory = new SimpleHgWorkdirFactory(Providers.of(environmentBuilder), new WorkdirProvider()) {
+      @Override
+      public void configure(com.aragost.javahg.commands.PullCommand pullCommand) {
+        // we do not want to configure http hooks in this unit test
+      }
+    };
+    hgModifyCommand = new HgModifyCommand(cmdContext, workdirFactory
+    );
+  }
+
+  @Test
+  public void shouldRemoveFiles() {
+    ModifyCommandRequest request = new ModifyCommandRequest();
+    request.addRequest(new ModifyCommandRequest.DeleteFileRequest("a.txt"));
+    request.setCommitMessage("this is great");
+    request.setAuthor(new Person("Arthur Dent", "dent@hitchhiker.com"));
+
+    String result = hgModifyCommand.execute(request);
+
+    assertThat(cmdContext.open().tip().getNode()).isEqualTo(result);
+  }
+
+  @Test
+  public void shouldCreateFilesWithoutOverwrite() throws IOException {
+    File testFile = temporaryFolder.newFile();
+
+    ModifyCommandRequest request = new ModifyCommandRequest();
+    request.addRequest(new ModifyCommandRequest.CreateFileRequest("Answer.txt", testFile, false));
+    request.setCommitMessage("I found the answer");
+    request.setAuthor(new Person("Trillian Astra", "trillian@hitchhiker.com"));
+
+    String changeSet = hgModifyCommand.execute(request);
+
+    assertThat(cmdContext.open().tip().getNode()).isEqualTo(changeSet);
+    assertThat(cmdContext.open().tip().getAddedFiles().size()).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldOverwriteExistingFiles() throws IOException {
+    File testFile = temporaryFolder.newFile();
+
+    new FileOutputStream(testFile).write(42);
+    ModifyCommandRequest request2 = new ModifyCommandRequest();
+    request2.addRequest(new ModifyCommandRequest.CreateFileRequest("a.txt", testFile, true));
+    request2.setCommitMessage(" Now i really found the answer");
+    request2.setAuthor(new Person("Trillian Astra", "trillian@hitchhiker.com"));
+
+    String changeSet2 = hgModifyCommand.execute(request2);
+
+    assertThat(cmdContext.open().tip().getNode()).isEqualTo(changeSet2);
+    assertThat(cmdContext.open().tip().getModifiedFiles().size()).isEqualTo(1);
+    assertThat(cmdContext.open().tip().getModifiedFiles().get(0)).isEqualTo("a.txt");
+  }
+
+  @Test(expected = AlreadyExistsException.class)
+  public void shouldThrowFileAlreadyExistsException() throws IOException {
+
+    File testFile = temporaryFolder.newFile();
+    new FileOutputStream(testFile).write(21);
+
+    ModifyCommandRequest request = new ModifyCommandRequest();
+    request.addRequest(new ModifyCommandRequest.CreateFileRequest("Answer.txt", testFile, false));
+    request.setCommitMessage("I found the answer");
+    request.setAuthor(new Person("Trillian Astra", "trillian@hitchhiker.com"));
+
+    hgModifyCommand.execute(request);
+
+    new FileOutputStream(testFile).write(42);
+    ModifyCommandRequest request2 = new ModifyCommandRequest();
+    request2.addRequest(new ModifyCommandRequest.CreateFileRequest("Answer.txt", testFile, false));
+    request2.setCommitMessage(" Now i really found the answer");
+    request2.setAuthor(new Person("Trillian Astra", "trillian@hitchhiker.com"));
+
+    hgModifyCommand.execute(request2);
+  }
+
+  @Test
+  public void shouldModifyExistingFile() throws IOException {
+    File testFile = temporaryFolder.newFile("a.txt");
+
+    new FileOutputStream(testFile).write(42);
+    ModifyCommandRequest request2 = new ModifyCommandRequest();
+    request2.addRequest(new ModifyCommandRequest.ModifyFileRequest("a.txt", testFile));
+    request2.setCommitMessage(" Now i really found the answer");
+    request2.setAuthor(new Person("Trillian Astra", "trillian@hitchhiker.com"));
+
+    String changeSet2 = hgModifyCommand.execute(request2);
+
+    assertThat(cmdContext.open().tip().getNode()).isEqualTo(changeSet2);
+    assertThat(cmdContext.open().tip().getModifiedFiles().size()).isEqualTo(1);
+    assertThat(cmdContext.open().tip().getModifiedFiles().get(0)).isEqualTo(testFile.getName());
+  }
+
+  @Test(expected = NotFoundException.class)
+  public void shouldThrowNotFoundExceptionIfFileDoesNotExist() throws IOException {
+    File testFile = temporaryFolder.newFile("Answer.txt");
+
+    new FileOutputStream(testFile).write(42);
+    ModifyCommandRequest request2 = new ModifyCommandRequest();
+    request2.addRequest(new ModifyCommandRequest.ModifyFileRequest("Answer.txt", testFile));
+    request2.setCommitMessage(" Now i really found the answer");
+    request2.setAuthor(new Person("Trillian Astra", "trillian@hitchhiker.com"));
+
+    hgModifyCommand.execute(request2);
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void shouldThrowNPEIfAuthorIsMissing() throws IOException {
+    File testFile = temporaryFolder.newFile();
+
+    ModifyCommandRequest request = new ModifyCommandRequest();
+    request.addRequest(new ModifyCommandRequest.CreateFileRequest("Answer.txt", testFile, false));
+    request.setCommitMessage("I found the answer");
+    hgModifyCommand.execute(request);
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void shouldThrowNPEIfCommitMessageIsMissing() throws IOException {
+    File testFile = temporaryFolder.newFile();
+
+    ModifyCommandRequest request = new ModifyCommandRequest();
+    request.addRequest(new ModifyCommandRequest.CreateFileRequest("Answer.txt", testFile, false));
+    request.setAuthor(new Person("Trillian Astra", "trillian@hitchhiker.com"));
+    hgModifyCommand.execute(request);
+  }
+
+  @Test(expected = NoChangesMadeException.class)
+  public void shouldThrowNoChangesMadeExceptionIfEmptyLocalChangesetAfterRequest() {
+    hgModifyCommand.execute(new ModifyCommandRequest());
+  }
+}