motiejus
/
jgit
1
Fork 0
Code Releases Activity

IndexDiff: Always use TreeWalk.getPathString() 

Instead of asking the individual iterators for their path string, use
the TreeWalk's generic getPathString() method.  Its just as fast
because it uses the path of the current matching iterator.

Change-Id: I9b827fbbafce1c78f09d5527cdc64fbe9022a16e
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2010-12-07 18:42:10 -08:00
parent f4e9c8890c
commit ca9baa0ee2
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java
View File

@ -195,7 +195,7 @@ public boolean diff() throws IOException {
if (dirCacheIterator != null) {
if (dirCacheIterator.getDirCacheEntry().isAssumeValid())
assumeUnchanged.add(dirCacheIterator.getEntryPathString());
assumeUnchanged.add(treeWalk.getPathString());
}
if (treeIterator != null) {
@ -203,29 +203,28 @@ public boolean diff() throws IOException {
if (!treeIterator.getEntryObjectId().equals(
dirCacheIterator.getEntryObjectId())) {
// in repo, in index, content diff => changed
changed.add(dirCacheIterator.getEntryPathString());
changed.add(treeWalk.getPathString());
changesExist = true;
}
} else {
// in repo, not in index => removed
if (!fileModeTree.equals(FileMode.TYPE_TREE)) {
removed.add(treeIterator.getEntryPathString());
removed.add(treeWalk.getPathString());
changesExist = true;
if (workingTreeIterator != null)
untracked.add(workingTreeIterator
.getEntryPathString());
untracked.add(treeWalk.getPathString());
}
}
} else {
if (dirCacheIterator != null) {
// not in repo, in index => added
added.add(dirCacheIterator.getEntryPathString());
added.add(treeWalk.getPathString());
changesExist = true;
} else {
// not in repo, not in index => untracked
if (workingTreeIterator != null
&& !workingTreeIterator.isEntryIgnored()) {
untracked.add(workingTreeIterator.getEntryPathString());
untracked.add(treeWalk.getPathString());
changesExist = true;
}
}
@ -234,12 +233,12 @@ public boolean diff() throws IOException {
if (dirCacheIterator != null) {
if (workingTreeIterator == null) {
// in index, not in workdir => missing
missing.add(dirCacheIterator.getEntryPathString());
missing.add(treeWalk.getPathString());
changesExist = true;
} else {
if (!dirCacheIterator.idEqual(workingTreeIterator)) {
// in index, in workdir, content differs => modified
modified.add(dirCacheIterator.getEntryPathString());
modified.add(treeWalk.getPathString());
changesExist = true;
}
}