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

Revert changes to diff command components

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-11-11 13:08:40 +01:00
parent 913e5289e6
commit 0f0e7437fd
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scm-core/src/main/java/sonia/scm/repository/spi/DiffCommandRequest.java
View File

@@ -90,10 +90,8 @@ public final class DiffCommandRequest extends FileBaseCommandRequest
@Override
public boolean isValid()
{
return (!Strings.isNullOrEmpty(getPath())
||!Strings.isNullOrEmpty(getRevision()))
&& (Strings.isNullOrEmpty(getAncestorChangeset())
|| Strings.isNullOrEmpty(getMergeChangeset()));
return !Strings.isNullOrEmpty(getPath())
||!Strings.isNullOrEmpty(getRevision());
}
//~--- set methods ----------------------------------------------------------
@@ -114,12 +112,7 @@ public final class DiffCommandRequest extends FileBaseCommandRequest
public void setAncestorChangeset(String ancestorChangeset) {
this.ancestorChangeset = ancestorChangeset;
}
public void setConflictBranch(String mergeChangeset) {
this.mergeChangeset = mergeChangeset;
}
//~--- get methods ----------------------------------------------------------
//~--- get methods ----------------------------------------------------------
/**
* Return the output format of the diff command.
@@ -137,17 +130,10 @@ public final class DiffCommandRequest extends FileBaseCommandRequest
public String getAncestorChangeset() {
return ancestorChangeset;
}
public String getMergeChangeset() {
return mergeChangeset;
}
//~--- fields ---------------------------------------------------------------
//~--- fields ---------------------------------------------------------------
/** diff format */
private DiffFormat format = DiffFormat.NATIVE;
private String ancestorChangeset;
private String mergeChangeset;
}

1
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java
View File

@@ -69,4 +69,5 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand {
}
};
}
}