Rename method to ResolveMerger.setWorkingTreeIterator()
renamed an ugly methodname Change-Id: I26bda06ef64b8644fd3a555dc55dff43cdb56a71 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
This commit is contained in:
parent
5c135a5856
commit
fb1e500adc
|
@ -176,7 +176,7 @@ public MergeResult call() throws NoHeadException,
|
||||||
ResolveMerger resolveMerger = (ResolveMerger) merger;
|
ResolveMerger resolveMerger = (ResolveMerger) merger;
|
||||||
resolveMerger.setCommitNames(new String[] {
|
resolveMerger.setCommitNames(new String[] {
|
||||||
"BASE", "HEAD", ref.getName() });
|
"BASE", "HEAD", ref.getName() });
|
||||||
resolveMerger.setWorkingTreeIt(new FileTreeIterator(repo));
|
resolveMerger.setWorkingTreeIterator(new FileTreeIterator(repo));
|
||||||
noProblems = merger.merge(headCommit, srcCommit);
|
noProblems = merger.merge(headCommit, srcCommit);
|
||||||
lowLevelResults = resolveMerger
|
lowLevelResults = resolveMerger
|
||||||
.getMergeResults();
|
.getMergeResults();
|
||||||
|
|
|
@ -132,7 +132,7 @@ public enum MergeFailureReason {
|
||||||
|
|
||||||
private DirCache dircache;
|
private DirCache dircache;
|
||||||
|
|
||||||
private WorkingTreeIterator workingTreeIt;
|
private WorkingTreeIterator workingTreeIterator;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -176,8 +176,8 @@ protected boolean mergeImpl() throws IOException {
|
||||||
tw.addTree(sourceTrees[0]);
|
tw.addTree(sourceTrees[0]);
|
||||||
tw.addTree(sourceTrees[1]);
|
tw.addTree(sourceTrees[1]);
|
||||||
tw.addTree(buildIt);
|
tw.addTree(buildIt);
|
||||||
if (workingTreeIt != null)
|
if (workingTreeIterator != null)
|
||||||
tw.addTree(workingTreeIt);
|
tw.addTree(workingTreeIterator);
|
||||||
|
|
||||||
while (tw.next()) {
|
while (tw.next()) {
|
||||||
if (!processEntry(
|
if (!processEntry(
|
||||||
|
@ -185,7 +185,7 @@ protected boolean mergeImpl() throws IOException {
|
||||||
tw.getTree(T_OURS, CanonicalTreeParser.class),
|
tw.getTree(T_OURS, CanonicalTreeParser.class),
|
||||||
tw.getTree(T_THEIRS, CanonicalTreeParser.class),
|
tw.getTree(T_THEIRS, CanonicalTreeParser.class),
|
||||||
tw.getTree(T_INDEX, DirCacheBuildIterator.class),
|
tw.getTree(T_INDEX, DirCacheBuildIterator.class),
|
||||||
(workingTreeIt == null) ? null : tw.getTree(T_FILE, WorkingTreeIterator.class))) {
|
(workingTreeIterator == null) ? null : tw.getTree(T_FILE, WorkingTreeIterator.class))) {
|
||||||
cleanUp();
|
cleanUp();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -612,10 +612,10 @@ public void setDirCache(DirCache dc) {
|
||||||
* TODO: enhance WorkingTreeIterator to support write operations. Then this
|
* TODO: enhance WorkingTreeIterator to support write operations. Then this
|
||||||
* merger will be able to merge with a different working tree abstraction.
|
* merger will be able to merge with a different working tree abstraction.
|
||||||
*
|
*
|
||||||
* @param workingTreeIt
|
* @param workingTreeIterator
|
||||||
* the workingTreeIt to set
|
* the workingTreeIt to set
|
||||||
*/
|
*/
|
||||||
public void setWorkingTreeIt(WorkingTreeIterator workingTreeIt) {
|
public void setWorkingTreeIterator(WorkingTreeIterator workingTreeIterator) {
|
||||||
this.workingTreeIt = workingTreeIt;
|
this.workingTreeIterator = workingTreeIterator;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue