motiejus
/
jgit
1
Fork 0
Code Releases Activity

WorkTreeUpdater#Result: hide data members 

This is the standard across JGit.

Change-Id: Ie52ad7000d8725657b33dd4f3adcc05ab9666875
This commit is contained in:
Han-Wen Nienhuys 2022-08-18 18:10:47 +02:00 committed by Han-Wen NIenhuys
parent d718127a7e
commit ddb1a0c3a2
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -1181,12 +1181,12 @@ protected boolean mergeTrees(AbstractTreeIterator baseTree,
workTreeUpdater.writeWorkTreeChanges(true);
if (getUnmergedPaths().isEmpty() && !failed()) {
WorkTreeUpdater.Result result = workTreeUpdater.writeIndexChanges();
resultTree = result.treeId;
modifiedFiles = result.modifiedFiles;
for (String f : result.failedToDelete) {
resultTree = result.getTreeId();
modifiedFiles = result.getModifiedFiles();
for (String f : result.getFailedToDelete()) {
failingPaths.put(f, MergeFailureReason.COULD_NOT_DELETE);
}
return result.failedToDelete.isEmpty();
return result.getFailedToDelete().isEmpty();
}
resultTree = null;
return false;

29
org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
View File

@ -74,20 +74,33 @@ public class WorkTreeUpdater implements Closeable {
*/
public static class Result {
/**
* Files modified during this operation.
*/
public List<String> modifiedFiles = new LinkedList<>();
private final List<String> modifiedFiles = new LinkedList<>();
private final List<String> failedToDelete = new LinkedList<>();
private ObjectId treeId = null;
/**
* Files in this list were failed to be deleted.
* @return Modified tree ID if any, or null otherwise.
*/
public List<String> failedToDelete = new LinkedList<>();
public ObjectId getTreeId() {
return treeId;
}
/**
* Modified tree ID if any, or null otherwise.
* @return Files that couldn't be deleted.
*/
public ObjectId treeId = null;
public List<String> getFailedToDelete() {
return failedToDelete;
}
/**
* @return Files modified during this operation.
*/
public List<String> getModifiedFiles() {
return modifiedFiles;
}
}
Result result = new Result();