Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 294:32890bab7209
Issue 13: Report filenames as they are known in repository rather than from file system
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 14 Sep 2011 04:41:57 +0200 |
| parents | 9774f47d904d |
| children | 981f9f50bb6c |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java Wed Sep 14 04:11:37 2011 +0200 +++ b/src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java Wed Sep 14 04:41:57 2011 +0200 @@ -175,14 +175,14 @@ if ((knownInDirstate = ds.known(fname)) != null) { // found in dirstate processed.add(knownInDirstate); - if (ds.checkRemoved(fname) == null) { - inspector.missing(fname); + if (ds.checkRemoved(knownInDirstate) == null) { + inspector.missing(knownInDirstate); } else { - inspector.removed(fname); + inspector.removed(knownInDirstate); } // do not report it as removed later if (collect != null) { - baseRevFiles.remove(fname); + baseRevFiles.remove(knownInDirstate); } } else { // chances are it was known in baseRevision. We may rely @@ -207,9 +207,9 @@ // modified, added, removed, clean processed.add(knownInDirstate); if (collect != null) { // need to check against base revision, not FS file - checkLocalStatusAgainstBaseRevision(baseRevFiles, collect, baseRevision, fname, f, inspector); + checkLocalStatusAgainstBaseRevision(baseRevFiles, collect, baseRevision, knownInDirstate, f, inspector); } else { - checkLocalStatusAgainstFile(fname, f, inspector); + checkLocalStatusAgainstFile(knownInDirstate, f, inspector); } } else { if (hgIgnore.isIgnored(fname)) { // hgignore shall be consulted only for non-tracked files