Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 13363:999f616b09dc
bookmarks: merge lookup into localrepo
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 10 Feb 2011 13:46:28 -0600 |
parents | bab5490eb2bc |
children | ddddb76f2da3 |
comparison
equal
deleted
inserted
replaced
13362:ee01d9d84115 | 13363:999f616b09dc |
---|---|
518 elif key == 'tip': | 518 elif key == 'tip': |
519 return self.changelog.tip() | 519 return self.changelog.tip() |
520 n = self.changelog._match(key) | 520 n = self.changelog._match(key) |
521 if n: | 521 if n: |
522 return n | 522 return n |
523 if key in self._bookmarks: | |
524 return self._bookmarks[key] | |
523 if key in self.tags(): | 525 if key in self.tags(): |
524 return self.tags()[key] | 526 return self.tags()[key] |
525 if key in self.branchtags(): | 527 if key in self.branchtags(): |
526 return self.branchtags()[key] | 528 return self.branchtags()[key] |
527 n = self.changelog._partialmatch(key) | 529 n = self.changelog._partialmatch(key) |