Show More
@@ -628,7 +628,7 b' def annotate(ui, repo, *pats, **opts):' | |||||
628 | raise util.Abort(_('at least one file name or pattern required')) |
|
628 | raise util.Abort(_('at least one file name or pattern required')) | |
629 |
|
629 | |||
630 | opmap = [['user', lambda x: ui.shortuser(x.user())], |
|
630 | opmap = [['user', lambda x: ui.shortuser(x.user())], | |
631 |
['number', lambda x: str(x. |
|
631 | ['number', lambda x: str(x.rev())], | |
632 | ['changeset', lambda x: short(x.node())], |
|
632 | ['changeset', lambda x: short(x.node())], | |
633 | ['date', getdate], ['follow', lambda x: x.path()]] |
|
633 | ['date', getdate], ['follow', lambda x: x.path()]] | |
634 | if (not opts['user'] and not opts['changeset'] and not opts['date'] |
|
634 | if (not opts['user'] and not opts['changeset'] and not opts['date'] |
@@ -185,7 +185,7 b' class filectx(object):' | |||||
185 | def rev(self): |
|
185 | def rev(self): | |
186 | if '_changectx' in self.__dict__: |
|
186 | if '_changectx' in self.__dict__: | |
187 | return self._changectx.rev() |
|
187 | return self._changectx.rev() | |
188 | return self.linkrev() |
|
188 | return self._filelog.linkrev(self._filenode) | |
189 |
|
189 | |||
190 | def node(self): return self._changectx.node() |
|
190 | def node(self): return self._changectx.node() | |
191 | def user(self): return self._changectx.user() |
|
191 | def user(self): return self._changectx.user() | |
@@ -195,7 +195,6 b' class filectx(object):' | |||||
195 | def manifest(self): return self._changectx.manifest() |
|
195 | def manifest(self): return self._changectx.manifest() | |
196 | def changectx(self): return self._changectx |
|
196 | def changectx(self): return self._changectx | |
197 |
|
197 | |||
198 | def linkrev(self): return self._filelog.linkrev(self._filenode) |
|
|||
199 | def data(self): return self._filelog.read(self._filenode) |
|
198 | def data(self): return self._filelog.read(self._filenode) | |
200 | def renamed(self): return self._filelog.renamed(self._filenode) |
|
199 | def renamed(self): return self._filelog.renamed(self._filenode) | |
201 | def path(self): return self._path |
|
200 | def path(self): return self._path |
@@ -385,7 +385,7 b' class hgweb(object):' | |||||
385 |
|
385 | |||
386 | yield {"parity": parity, |
|
386 | yield {"parity": parity, | |
387 | "node": hex(f.node()), |
|
387 | "node": hex(f.node()), | |
388 |
"rev": f. |
|
388 | "rev": f.rev(), | |
389 | "author": name, |
|
389 | "author": name, | |
390 | "file": f.path(), |
|
390 | "file": f.path(), | |
391 | "line": l} |
|
391 | "line": l} |
General Comments 0
You need to be logged in to leave comments.
Login now