Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 7361:9fe97eea5510
linkrev: take a revision number rather than a hash
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 12 Nov 2008 15:19:14 -0600 |
| parents | b6f5490effbf |
| children | ad7f736f3214 |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Nov 13 10:11:32 2008 +0100 +++ b/mercurial/commands.py Wed Nov 12 15:19:14 2008 -0600 @@ -829,7 +829,7 @@ except: pp = [nullid, nullid] ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( - i, r.start(i), r.length(i), r.base(i), r.linkrev(node), + i, r.start(i), r.length(i), r.base(i), r.linkrev(i), short(node), short(pp[0]), short(pp[1]))) def debugindexdot(ui, file_): @@ -1833,7 +1833,7 @@ fl = repo.file(fn) for i in fl: node = fl.node(i) - lr = fl.linkrev(node) + lr = fl.linkrev(i) renamed = fl.renamed(node) rcache[fn][lr] = renamed if renamed: @@ -2053,7 +2053,7 @@ if not filenodes: raise util.Abort(_("'%s' not found in manifest!") % file_) fl = repo.file(file_) - p = [repo.lookup(fl.linkrev(fn)) for fn in filenodes] + p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes] else: p = [cp.node() for cp in ctx.parents()]