Mercurial > hg4j
comparison src/org/tmatesoft/hg/internal/KeywordFilter.java @ 367:2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Fri, 16 Dec 2011 15:37:27 +0100 |
parents | 5f9073eabf06 |
children | 528b6780a8bd |
comparison
equal
deleted
inserted
replaced
366:189dc6dc1c3e | 367:2fadf8695f8a |
---|---|
258 } | 258 } |
259 | 259 |
260 private String revision() { | 260 private String revision() { |
261 try { | 261 try { |
262 // FIXME add cset's nodeid into Changeset class | 262 // FIXME add cset's nodeid into Changeset class |
263 int csetRev = repo.getFileNode(path).getChangesetLocalRevision(HgRepository.TIP); | 263 int csetRev = repo.getFileNode(path).getChangesetRevisionIndex(HgRepository.TIP); |
264 return repo.getChangelog().getRevision(csetRev).shortNotation(); | 264 return repo.getChangelog().getRevision(csetRev).shortNotation(); |
265 } catch (HgException ex) { | 265 } catch (HgException ex) { |
266 HgInternals.getContext(repo).getLog().error(getClass(), ex, null); | 266 HgInternals.getContext(repo).getLog().error(getClass(), ex, null); |
267 return Nodeid.NULL.shortNotation(); // XXX perhaps, might return anything better? Not sure how hg approaches this. | 267 return Nodeid.NULL.shortNotation(); // XXX perhaps, might return anything better? Not sure how hg approaches this. |
268 } | 268 } |
289 } | 289 } |
290 | 290 |
291 private RawChangeset getChangeset() throws HgInvalidControlFileException { | 291 private RawChangeset getChangeset() throws HgInvalidControlFileException { |
292 if (latestFileCset == null) { | 292 if (latestFileCset == null) { |
293 // XXX consider use of ChangelogHelper | 293 // XXX consider use of ChangelogHelper |
294 int csetRev = repo.getFileNode(path).getChangesetLocalRevision(HgRepository.TIP); | 294 int csetRev = repo.getFileNode(path).getChangesetRevisionIndex(HgRepository.TIP); |
295 latestFileCset = repo.getChangelog().range(csetRev, csetRev).get(0); | 295 latestFileCset = repo.getChangelog().range(csetRev, csetRev).get(0); |
296 } | 296 } |
297 return latestFileCset; | 297 return latestFileCset; |
298 } | 298 } |
299 | 299 |