Back out d8eba1c3ce9b and a004164dbeef

mercurial/commands.py

@@ -628,7 +628,7 b' 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']

mercurial/context.py

@@ -185,7 +185,7 b' 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 b' 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

mercurial/hgweb/hgweb_mod.py

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