Mercurial > public > mercurial-scm > hg-stable
comparison 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 |
comparison
equal
deleted
inserted
replaced
7360:42f1b8cb9a60 | 7361:9fe97eea5510 |
---|---|
827 try: | 827 try: |
828 pp = r.parents(node) | 828 pp = r.parents(node) |
829 except: | 829 except: |
830 pp = [nullid, nullid] | 830 pp = [nullid, nullid] |
831 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( | 831 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
832 i, r.start(i), r.length(i), r.base(i), r.linkrev(node), | 832 i, r.start(i), r.length(i), r.base(i), r.linkrev(i), |
833 short(node), short(pp[0]), short(pp[1]))) | 833 short(node), short(pp[0]), short(pp[1]))) |
834 | 834 |
835 def debugindexdot(ui, file_): | 835 def debugindexdot(ui, file_): |
836 """dump an index DAG as a .dot file""" | 836 """dump an index DAG as a .dot file""" |
837 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) | 837 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) |
1831 rcache[fn] = {} | 1831 rcache[fn] = {} |
1832 ncache[fn] = {} | 1832 ncache[fn] = {} |
1833 fl = repo.file(fn) | 1833 fl = repo.file(fn) |
1834 for i in fl: | 1834 for i in fl: |
1835 node = fl.node(i) | 1835 node = fl.node(i) |
1836 lr = fl.linkrev(node) | 1836 lr = fl.linkrev(i) |
1837 renamed = fl.renamed(node) | 1837 renamed = fl.renamed(node) |
1838 rcache[fn][lr] = renamed | 1838 rcache[fn][lr] = renamed |
1839 if renamed: | 1839 if renamed: |
1840 ncache[fn][node] = renamed | 1840 ncache[fn][node] = renamed |
1841 if lr >= endrev: | 1841 if lr >= endrev: |
2051 except revlog.LookupError: | 2051 except revlog.LookupError: |
2052 pass | 2052 pass |
2053 if not filenodes: | 2053 if not filenodes: |
2054 raise util.Abort(_("'%s' not found in manifest!") % file_) | 2054 raise util.Abort(_("'%s' not found in manifest!") % file_) |
2055 fl = repo.file(file_) | 2055 fl = repo.file(file_) |
2056 p = [repo.lookup(fl.linkrev(fn)) for fn in filenodes] | 2056 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes] |
2057 else: | 2057 else: |
2058 p = [cp.node() for cp in ctx.parents()] | 2058 p = [cp.node() for cp in ctx.parents()] |
2059 | 2059 |
2060 displayer = cmdutil.show_changeset(ui, repo, opts) | 2060 displayer = cmdutil.show_changeset(ui, repo, opts) |
2061 for n in p: | 2061 for n in p: |