Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 16761:07741a5d6608
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 21 May 2012 16:35:27 -0500 |
parents | e825a89de5d7 ac89a23ca814 |
children | 91f3ac205816 |
comparison
equal
deleted
inserted
replaced
16758:9a8ab5c47f84 | 16761:07741a5d6608 |
---|---|
25 | 25 |
26 if isinstance(changeid, int): | 26 if isinstance(changeid, int): |
27 self._rev = changeid | 27 self._rev = changeid |
28 self._node = repo.changelog.node(changeid) | 28 self._node = repo.changelog.node(changeid) |
29 return | 29 return |
30 if isinstance(changeid, long): | |
31 changeid = str(changeid) | |
30 if changeid == '.': | 32 if changeid == '.': |
31 self._node = repo.dirstate.p1() | 33 self._node = repo.dirstate.p1() |
32 self._rev = repo.changelog.rev(self._node) | 34 self._rev = repo.changelog.rev(self._node) |
33 return | 35 return |
34 if changeid == 'null': | 36 if changeid == 'null': |