facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

Back out da2c890e2644 and 278eadc04b61

Browse Source
This commit is contained in:
Brendan Cully 2006-10-15 18:25:07 -07:00
parent 6230c1e325
commit 63d34eb36b
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/commands.py
View File

@ -628,7 +628,7 @@ def annotate(ui, repo, *pats, **opts):
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']

3
mercurial/context.py
View File

@ -185,7 +185,7 @@ class filectx(object):
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 @@ class filectx(object):
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

2
mercurial/hgweb/hgweb_mod.py
View File

@ -385,7 +385,7 @@ class hgweb(object):
yield {"parity": parity,
"node": hex(f.node()),
"rev": f.linkrev(),
"rev": f.rev(),
"author": name,
"file": f.path(),
"line": l}