motiejus
/
jgit
1
Fork 0
Code Releases Activity

IndexDiff: Fix getAssumeUnchanged() 

If the caller really needs the list of files that are flagged as
assume-unchanged (aka assume-valid in the DirCache), we should give
them the complete list and not just those that we wrongly identified
as being modified during diff().

This change is necessary because diff() is slightly broken and is
discovering differences on files that it shouldn't have considered.

Change-Id: Ibe464c1a0e51c19dc287a4bc5348b7b07f4d840b
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2010-12-07 18:53:09 -08:00
parent 72f87adce6
commit e6c3922764
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,9 @@ public class IndexDiff {
private Set<String> untracked = new HashSet<String>();
private Set<String> assumeUnchanged = new HashSet<String>();
private Set<String> assumeUnchanged;
private DirCache dirCache;
/**
* Construct an IndexDiff
@ -167,7 +169,8 @@ public void setFilter(TreeFilter filter) {
*/
public boolean diff() throws IOException {
boolean changesExist = false;
DirCache dirCache = repository.readDirCache();
dirCache = repository.readDirCache();
TreeWalk treeWalk = new TreeWalk(repository);
treeWalk.setRecursive(true);
// add the trees (tree, dirchache, workdir)
@ -192,11 +195,6 @@ public boolean diff() throws IOException {
WorkingTreeIterator workingTreeIterator = treeWalk.getTree(WORKDIR,
WorkingTreeIterator.class);
if (dirCacheIterator != null) {
if (dirCacheIterator.getDirCacheEntry().isAssumeValid())
assumeUnchanged.add(treeWalk.getPathString());
}
if (treeIterator != null) {
if (dirCacheIterator != null) {
if (!treeIterator.getEntryObjectId().equals(
@ -290,6 +288,13 @@ public Set<String> getUntracked() {
* @return list of files with the flag assume-unchanged
*/
public Set<String> getAssumeUnchanged() {
if (assumeUnchanged == null) {
HashSet<String> unchanged = new HashSet<String>();
for (int i = 0; i < dirCache.getEntryCount(); i++)
if (dirCache.getEntry(i).isAssumeValid())
unchanged.add(dirCache.getEntry(i).getPathString());
assumeUnchanged = unchanged;
}
return assumeUnchanged;
}
}