Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-22 00:09:47 +01:00
Code Issues Packages Projects Releases Activity

Hide getEffectedPaths for other packages

Browse Source
This commit is contained in:
René Pfeuffer
2020-05-15 14:33:04 +02:00
parent 74b959e451
commit c722565109
15 changed files with 299 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModificationsCommand.java
View File

@@ -32,10 +32,14 @@ import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.EmptyTreeIterator;
import org.eclipse.jgit.treewalk.TreeWalk;
import sonia.scm.repository.Added;
import sonia.scm.repository.GitUtil;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.Modification;
import sonia.scm.repository.Modifications;
import sonia.scm.repository.Modified;
import sonia.scm.repository.Removed;
import sonia.scm.repository.Renamed;
import java.io.IOException;
import java.text.MessageFormat;
@@ -117,13 +121,13 @@ public class GitModificationsCommand extends AbstractGitCommand implements Modif
DiffEntry.ChangeType type = entry.getChangeType();
switch (type) {
case ADD:
return new Modification.Added(entry.getNewPath());
return new Added(entry.getNewPath());
case MODIFY:
return new Modification.Modified(entry.getNewPath());
return new Modified(entry.getNewPath());
case DELETE:
return new Modification.Removed(entry.getOldPath());
return new Removed(entry.getOldPath());
case RENAME:
return new Modification.Renamed(entry.getOldPath(), entry.getNewPath());
return new Renamed(entry.getOldPath(), entry.getNewPath());
default:
throw new UnsupportedModificationTypeException(entity(repository), MessageFormat.format("The modification type: {0} is not supported.", type));
}

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
View File

@@ -39,8 +39,8 @@ import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import sonia.scm.NoChangesMadeException;
import sonia.scm.NotFoundException;
import sonia.scm.repository.Added;
import sonia.scm.repository.GitWorkdirFactory;
import sonia.scm.repository.Modification;
import sonia.scm.repository.Person;
import sonia.scm.repository.api.MergeCommandResult;
import sonia.scm.repository.api.MergeStrategy;
@@ -319,7 +319,7 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
assertThat(message).isEqualTo("squash three commits");
GitModificationsCommand modificationsCommand = new GitModificationsCommand(createContext());
List<Modification.Added> changes = modificationsCommand.getModifications("master").getAdded();
List<Added> changes = modificationsCommand.getModifications("master").getAdded();
assertThat(changes.size()).isEqualTo(3);
}