# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1160959087 25200
# Node ID a004164dbeef3f1e095585f5eea54171a4fb4412
# Parent  d8eba1c3ce9ba2491f78ea4668f039e92bf774d9
Make annotate use linkrev instead of rev

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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.rev())],
+             ['number', lambda x: str(x.linkrev())],
              ['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 --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -385,7 +385,7 @@ class hgweb(object):
 
                 yield {"parity": parity,
                        "node": hex(f.node()),
-                       "rev": f.rev(),
+                       "rev": f.linkrev(),
                        "author": name,
                        "file": f.path(),
                        "line": l}