# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1160961907 25200
# Node ID 372999405787ac16203c6aa8c148404323f83466
# Parent  a004164dbeef3f1e095585f5eea54171a4fb4412
Back out d8eba1c3ce9b and a004164dbeef

diff -r a004164dbeef -r 372999405787 mercurial/commands.py
--- 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']
diff -r a004164dbeef -r 372999405787 mercurial/context.py
--- 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
diff -r a004164dbeef -r 372999405787 mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Sun Oct 15 17:38:07 2006 -0700
+++ b/mercurial/hgweb/hgweb_mod.py	Sun Oct 15 18:25:07 2006 -0700
@@ -385,7 +385,7 @@
 
                 yield {"parity": parity,
                        "node": hex(f.node()),
-                       "rev": f.linkrev(),
+                       "rev": f.rev(),
                        "author": name,
                        "file": f.path(),
                        "line": l}