Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 537:5a455624be4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update javadoc for HgManifest.Inspector and fix erroneous internal API
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Tue, 05 Feb 2013 20:06:22 +0100
parents 27398bbfd543
children e1b29756f901
comparison
equal deleted inserted replaced
536:2813a26b8999 537:5a455624be4f
1 /* 1 /*
2 * Copyright (c) 2011-2012 TMate Software Ltd 2 * Copyright (c) 2011-2013 TMate Software Ltd
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify 4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 2 of the License. 6 * the Free Software Foundation; version 2 of the License.
7 * 7 *
196 // nodeidAfterChange(dirstate's parent) doesn't make too much sense, 196 // nodeidAfterChange(dirstate's parent) doesn't make too much sense,
197 // because the change might be actually in working copy. Nevertheless, 197 // because the change might be actually in working copy. Nevertheless,
198 // as long as no nodeids can be provided for WC, seems reasonable to report 198 // as long as no nodeids can be provided for WC, seems reasonable to report
199 // latest known nodeid change (although at the moment this is not used and 199 // latest known nodeid change (although at the moment this is not used and
200 // is done mostly not to leave stale initialization in the Record) 200 // is done mostly not to leave stale initialization in the Record)
201 int rev1,rev2 = getDirstateParentManifest().changesetLocalRev(); 201 int rev1,rev2 = getDirstateParentManifest().changesetRevisionIndex();
202 if (baseRevision == TIP || baseRevision == WORKING_COPY) { 202 if (baseRevision == TIP || baseRevision == WORKING_COPY) {
203 rev1 = rev2 - 1; // just use revision prior to dirstate's parent 203 rev1 = rev2 - 1; // just use revision prior to dirstate's parent
204 } else { 204 } else {
205 rev1 = baseRevision; 205 rev1 = baseRevision;
206 } 206 }