Mercurial > hg
changeset 3403:372999405787
Back out d8eba1c3ce9b and a004164dbeef
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Sun, 15 Oct 2006 18:25:07 -0700 |
| parents | a004164dbeef |
| children | 1a437b0f4902 |
| files | mercurial/commands.py mercurial/context.py mercurial/hgweb/hgweb_mod.py |
| diffstat | 3 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Oct 15 17:38:07 2006 -0700 +++ b/mercurial/commands.py Sun Oct 15 18:25:07 2006 -0700 @@ -628,7 +628,7 @@ raise util.Abort(_('at least one file name or pattern required')) opmap = [['user', lambda x: ui.shortuser(x.user())], - ['number', lambda x: str(x.linkrev())], + ['number', lambda x: str(x.rev())], ['changeset', lambda x: short(x.node())], ['date', getdate], ['follow', lambda x: x.path()]] if (not opts['user'] and not opts['changeset'] and not opts['date']
--- a/mercurial/context.py Sun Oct 15 17:38:07 2006 -0700 +++ b/mercurial/context.py Sun Oct 15 18:25:07 2006 -0700 @@ -185,7 +185,7 @@ def rev(self): if '_changectx' in self.__dict__: return self._changectx.rev() - return self.linkrev() + return self._filelog.linkrev(self._filenode) def node(self): return self._changectx.node() def user(self): return self._changectx.user() @@ -195,7 +195,6 @@ def manifest(self): return self._changectx.manifest() def changectx(self): return self._changectx - def linkrev(self): return self._filelog.linkrev(self._filenode) def data(self): return self._filelog.read(self._filenode) def renamed(self): return self._filelog.renamed(self._filenode) def path(self): return self._path