Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 690:b286222158be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file.isCopy() use for status and cat commands
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 01 Aug 2013 21:45:47 +0200
parents 5050ee565bd1
children 7efabe0cddcf
comparison
equal deleted inserted replaced
689:5050ee565bd1 690:b286222158be
431 Nodeid fileRev = repo.getManifest().getFileRevision(csetIndex, fname); 431 Nodeid fileRev = repo.getManifest().getFileRevision(csetIndex, fname);
432 if (fileRev == null) { 432 if (fileRev == null) {
433 continue; 433 continue;
434 } 434 }
435 // see if file revision known in this parent got copied from one of baseRevNames 435 // see if file revision known in this parent got copied from one of baseRevNames
436 Path origin = HgStatusCollector.getOriginIfCopy(repo, fname, fileRev, baseRevNames, baseRevision); 436 Path origin = HgStatusCollector.getOriginIfCopy(repo, fname, fileRev, collect.files(), baseRevision);
437 if (origin != null) { 437 if (origin != null) {
438 inspector.copied(getPathPool().mangle(origin), fname); 438 inspector.copied(getPathPool().mangle(origin), fname);
439 return; 439 return;
440 } 440 }
441 } 441 }