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

Modifications command between two revisions (#1761)

Browse Source 
Adds the option to compute the modifications between two revisions unsing the modifications command.
This commit is contained in:
René Pfeuffer
2021-08-09 12:13:41 +02:00
committed by GitHub
parent ddd2fc1055
commit 8558572c99
22 changed files with 696 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModificationsCommandTest.java
View File

@@ -106,6 +106,36 @@ public class GitModificationsCommandTest extends AbstractRemoteCommandTestBase {
assertModifications.accept(incomingModificationsCommand.getModifications(revision));
}
@Test
public void shouldFindModificationsBetweenRevisions() throws Exception {
write(outgoing, outgoingDirectory, "a.txt", "bal bla");
write(outgoing, outgoingDirectory, "d.txt", "some file to be renamed");
RevCommit baseCommit = commit(outgoing, "add files");
write(outgoing, outgoingDirectory, "a.txt", "modified content");
commit(outgoing, "modify file");
write(outgoing, outgoingDirectory, "c.txt", "brand new file");
commit(outgoing, "add file");
write(outgoing, outgoingDirectory, "o.txt", "some file to be renamed");
outgoing.rm().addFilepattern("d.txt").call();
RevCommit targetCommit = commit(outgoing, "move/rename file");
outgoing.checkout().setName("some_branch").setCreateBranch(true).setStartPoint(baseCommit).call();
write(outgoing, outgoingDirectory, "x.txt", "bla bla");
RevCommit otherBranchCommit = commit(outgoing, "other branch");
Modifications modifications = outgoingModificationsCommand.getModifications(otherBranchCommit.getName(), targetCommit.getName());
assertThat(modifications.getModifications())
.hasSize(4)
.extracting("class.simpleName")
.contains("Modified") // File a.txt has been modified
.contains("Removed") // File x.txt from the other branch is not present
.contains("Added") // File c.txt has been created on the original branch
.contains("Renamed") // File d.txt has been renamed on the original branch
;
}
void pushOutgoingAndPullIncoming() throws IOException {
GitPushCommand cmd = new GitPushCommand(handler, new GitContext(outgoingDirectory, outgoingRepository, null, new GitConfig()));
PushCommandRequest request = new PushCommandRequest();