motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Reset internal state canonical length in WorkingTreeIterator when moving"

This commit is contained in:
Matthias Sohn 2014-02-04 03:03:27 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 8ae6295007 871ee53b52
commit 08fd639c0d
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java
View File

@ -56,9 +56,9 @@
import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.dircache.DirCacheCheckout;
import org.eclipse.jgit.dircache.DirCacheEditor; import org.eclipse.jgit.dircache.DirCacheEditor;
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.dircache.DirCacheIterator; import org.eclipse.jgit.dircache.DirCacheIterator;
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.MissingObjectException;
@ -98,6 +98,19 @@ public void setUp() throws Exception {
} }
} }
@Test
public void testGetEntryContentLength() throws Exception {
final FileTreeIterator fti = new FileTreeIterator(db);
fti.next(1);
assertEquals(3, fti.getEntryContentLength());
fti.back(1);
assertEquals(2, fti.getEntryContentLength());
fti.next(1);
assertEquals(3, fti.getEntryContentLength());
fti.reset();
assertEquals(2, fti.getEntryContentLength());
}
@Test @Test
public void testEmptyIfRootIsFile() throws Exception { public void testEmptyIfRootIsFile() throws Exception {
final File r = new File(trash, paths[0]); final File r = new File(trash, paths[0]);

2
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
View File

@ -465,7 +465,6 @@ public boolean eof() {
public void next(final int delta) throws CorruptObjectException { public void next(final int delta) throws CorruptObjectException {
ptr += delta; ptr += delta;
if (!eof()) { if (!eof()) {
canonLen = -1;
parseEntry(); parseEntry();
} }
} }
@ -484,6 +483,7 @@ private void parseEntry() {
ensurePathCapacity(pathOffset + nameLen, pathOffset); ensurePathCapacity(pathOffset + nameLen, pathOffset);
System.arraycopy(e.encodedName, 0, path, pathOffset, nameLen); System.arraycopy(e.encodedName, 0, path, pathOffset, nameLen);
pathLen = pathOffset + nameLen; pathLen = pathOffset + nameLen;
canonLen = -1;
} }
/** /**