mercurial-scm/hg: hgext/hgk.py annotate

annotate hgext/hgk.py @ 3063:aa1cee5b8afb

hgk.py: add an optional file list to debug-diff-tree this solves a problem when hgk was trying to display merges diff

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date	Wed, 06 Sep 2006 02:13:08 +0200
parents	3dab573a4330
children	fe5c92529d1c

rev	line source
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1 # Minimal support for git commands on an hg repository
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2 #
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2744 diff changeset	3 # Copyright 2005, 2006 Chris Mason <mason@suse.com>
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	4 #
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	5 # This software may be used and distributed according to the terms
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	7
2908 2497fa1c6b76 Use demandload in hgk Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2744 diff changeset	8 from mercurial.demandload import *
2497fa1c6b76 Use demandload in hgk Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2744 diff changeset	9 demandload(globals(), 'time sys signal os')
2497fa1c6b76 Use demandload in hgk Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2744 diff changeset	10 demandload(globals(), 'mercurial:hg,mdiff,fancyopts,commands,ui,util')
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	11
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	12 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	13 changes=None, text=False):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	14 def date(c):
1344 ca0e27e05de3 Fix hgk for date handling changes mpm@selenic.com parents: 1308 diff changeset	15 return time.asctime(time.gmtime(c[2][0]))
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	16
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	17 if not changes:
2875 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	18 changes = repo.status(node1, node2, files, match=match)[:5]
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	19 modified, added, removed, deleted, unknown = changes
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	20 if files:
1626 f2b1df3dbcbb make the order of the arguments for filterfiles consistent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	21 modified, added, removed = map(lambda x: filterfiles(files, x),
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1614 diff changeset	22 (modified, added, removed))
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	23
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1614 diff changeset	24 if not modified and not added and not removed:
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	25 return
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	26
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	27 if node2:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	28 change = repo.changelog.read(node2)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	29 mmap2 = repo.manifest.read(change[0])
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	30 date2 = date(change)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	31 def read(f):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	32 return repo.file(f).read(mmap2[f])
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	33 else:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	34 date2 = time.asctime()
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	35 if not node1:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	36 node1 = repo.dirstate.parents()[0]
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	37 def read(f):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	38 return repo.wfile(f).read()
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	39
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	40 change = repo.changelog.read(node1)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	41 mmap = repo.manifest.read(change[0])
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	42 date1 = date(change)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	43
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1614 diff changeset	44 for f in modified:
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	45 to = None
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	46 if f in mmap:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	47 to = repo.file(f).read(mmap[f])
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	48 tn = read(f)
3012 abcd6ae3cf5a Fix hgk extension due to 4ec58b157265 refactoring Edouard Gomez <ed.gomez@free.fr> parents: 2909 diff changeset	49 opts = mdiff.diffopts()
abcd6ae3cf5a Fix hgk extension due to 4ec58b157265 refactoring Edouard Gomez <ed.gomez@free.fr> parents: 2909 diff changeset	50 opts.text = text
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	51 fp.write("diff --git a/%s b/%s\n" % (f, f))
3012 abcd6ae3cf5a Fix hgk extension due to 4ec58b157265 refactoring Edouard Gomez <ed.gomez@free.fr> parents: 2909 diff changeset	52 fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, opts=opts))
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1614 diff changeset	53 for f in added:
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	54 to = None
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	55 tn = read(f)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	56 fp.write("diff --git /dev/null b/%s\n" % (f))
3012 abcd6ae3cf5a Fix hgk extension due to 4ec58b157265 refactoring Edouard Gomez <ed.gomez@free.fr> parents: 2909 diff changeset	57 fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, opts=opts))
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1614 diff changeset	58 for f in removed:
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	59 to = repo.file(f).read(mmap[f])
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	60 tn = None
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	61 fp.write("diff --git a/%s /dev/null\n" % (f))
3012 abcd6ae3cf5a Fix hgk extension due to 4ec58b157265 refactoring Edouard Gomez <ed.gomez@free.fr> parents: 2909 diff changeset	62 fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, opts=opts))
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	63
3063 aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	64 def difftree(ui, repo, node1=None, node2=None, files, *opts):
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	65 """diff trees from two commits"""
3063 aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	66 def __difftree(repo, node1, node2, files=[]):
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	67 def date(c):
1344 ca0e27e05de3 Fix hgk for date handling changes mpm@selenic.com parents: 1308 diff changeset	68 return time.asctime(time.gmtime(c[2][0]))
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	69
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	70 if node2:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	71 change = repo.changelog.read(node2)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	72 mmap2 = repo.manifest.read(change[0])
3063 aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	73 status = repo.status(node1, node2, files=files)[:5]
aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	74 modified, added, removed, deleted, unknown = status
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	75 def read(f): return repo.file(f).read(mmap2[f])
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	76 date2 = date(change)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	77 else:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	78 date2 = time.asctime()
3063 aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	79 status = repo.status(node1, files=files)[:5]
aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	80 modified, added, removed, deleted, unknown = status
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	81 if not node1:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	82 node1 = repo.dirstate.parents()[0]
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	83 def read(f): return file(os.path.join(repo.root, f)).read()
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	84
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	85 change = repo.changelog.read(node1)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	86 mmap = repo.manifest.read(change[0])
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	87 date1 = date(change)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	88 empty = "0" * 40;
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	89
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1614 diff changeset	90 for f in modified:
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	91 # TODO get file permissions
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	92 print ":100664 100664 %s %s M\t%s\t%s" % (hg.short(mmap[f]),
3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	93 hg.short(mmap2[f]),
3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	94 f, f)
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1614 diff changeset	95 for f in added:
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	96 print ":000000 100664 %s %s N\t%s\t%s" % (empty,
3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	97 hg.short(mmap2[f]),
3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	98 f, f)
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1614 diff changeset	99 for f in removed:
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	100 print ":100664 000000 %s %s D\t%s\t%s" % (hg.short(mmap[f]),
3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	101 empty,
3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	102 f, f)
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	103 ##
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	104
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	105 while True:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	106 if opts['stdin']:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	107 try:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	108 line = raw_input().split(' ')
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	109 node1 = line[0]
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	110 if len(line) > 1:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	111 node2 = line[1]
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	112 else:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	113 node2 = None
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	114 except EOFError:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	115 break
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	116 node1 = repo.lookup(node1)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	117 if node2:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	118 node2 = repo.lookup(node2)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	119 else:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	120 node2 = node1
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	121 node1 = repo.changelog.parents(node1)[0]
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	122 if opts['patch']:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	123 if opts['pretty']:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	124 catcommit(repo, node2, "")
3063 aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	125 dodiff(sys.stdout, ui, repo, node1, node2, files=files)
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	126 else:
3063 aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	127 __difftree(repo, node1, node2, files=files)
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	128 if not opts['stdin']:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	129 break
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	130
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	131 def catcommit(repo, n, prefix, changes=None):
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	132 nlprefix = '\n' + prefix;
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	133 (p1, p2) = repo.changelog.parents(n)
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	134 (h, h1, h2) = map(hg.short, (n, p1, p2))
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	135 (i1, i2) = map(repo.changelog.rev, (p1, p2))
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	136 if not changes:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	137 changes = repo.changelog.read(n)
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	138 print "tree %s" % (hg.short(changes[0]))
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	139 if i1 != -1: print "parent %s" % (h1)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	140 if i2 != -1: print "parent %s" % (h2)
1344 ca0e27e05de3 Fix hgk for date handling changes mpm@selenic.com parents: 1308 diff changeset	141 date_ar = changes[2]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	142 date = int(float(date_ar[0]))
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	143 lines = changes[4].splitlines()
2525 c49dc6f38a19 hgk: Don't choke on empty changelogs Brendan Cully <brendan@kublai.com> parents: 2432 diff changeset	144 if lines and lines[-1].startswith('committer:'):
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	145 committer = lines[-1].split(': ')[1].rstrip()
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	146 else:
1950 5f581f337b05 hgk "committer:" bug Hollis Blanchard <hollisb@us.ibm.com> parents: 1626 diff changeset	147 committer = changes[1]
1308 2073e5a71008 Cleanup of tabs and trailing spaces. Thomas Arendsen Hein <thomas@intevation.de> parents: 1278 diff changeset	148
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	149 print "author %s %s %s" % (changes[1], date, date_ar[1])
1950 5f581f337b05 hgk "committer:" bug Hollis Blanchard <hollisb@us.ibm.com> parents: 1626 diff changeset	150 print "committer %s %s %s" % (committer, date, date_ar[1])
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	151 print ""
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	152 if prefix != "":
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	153 print "%s%s" % (prefix, changes[4].replace('\n', nlprefix).strip())
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	154 else:
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	155 print changes[4]
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	156 if prefix:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	157 sys.stdout.write('\0')
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	158
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	159 def base(ui, repo, node1, node2):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	160 """Output common ancestor information"""
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	161 node1 = repo.lookup(node1)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	162 node2 = repo.lookup(node2)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	163 n = repo.changelog.ancestor(node1, node2)
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	164 print hg.short(n)
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	165
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	166 def catfile(ui, repo, type=None, r=None, **opts):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	167 """cat a specific revision"""
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	168 # in stdin mode, every line except the commit is prefixed with two
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	169 # spaces. This way the our caller can find the commit without magic
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	170 # strings
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	171 #
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	172 prefix = ""
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	173 if opts['stdin']:
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	174 try:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	175 (type, r) = raw_input().split(' ');
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	176 prefix = " "
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	177 except EOFError:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	178 return
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	179
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	180 else:
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	181 if not type or not r:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	182 ui.warn("cat-file: type or revision not supplied\n")
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	183 commands.help_(ui, 'cat-file')
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	184
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	185 while r:
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	186 if type != "commit":
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	187 sys.stderr.write("aborting hg cat-file only understands commits\n")
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	188 sys.exit(1);
720 095dd8c757e0 Change hgit revision lookup to use repo.lookup mason@suse.com parents: 719 diff changeset	189 n = repo.lookup(r)
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	190 catcommit(repo, n, prefix)
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	191 if opts['stdin']:
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	192 try:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	193 (type, r) = raw_input().split(' ');
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	194 except EOFError:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	195 break
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	196 else:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	197 break
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	198
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	199 # git rev-tree is a confusing thing. You can supply a number of
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	200 # commit sha1s on the command line, and it walks the commit history
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	201 # telling you which commits are reachable from the supplied ones via
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	202 # a bitmask based on arg position.
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	203 # you can specify a commit to stop at by starting the sha1 with ^
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	204 def revtree(args, repo, full="tree", maxnr=0, parents=False):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	205 def chlogwalk():
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	206 ch = repo.changelog
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	207 count = ch.count()
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	208 i = count
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	209 l = [0] * 100
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	210 chunk = 100
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	211 while True:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	212 if chunk > i:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	213 chunk = i
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	214 i = 0
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	215 else:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	216 i -= chunk
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	217
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	218 for x in xrange(0, chunk):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	219 if i + x >= count:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	220 l[chunk - x:] = [0] * (chunk - x)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	221 break
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	222 if full != None:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	223 l[x] = ch.read(ch.node(i + x))
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	224 else:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	225 l[x] = 1
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	226 for x in xrange(chunk-1, -1, -1):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	227 if l[x] != 0:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	228 yield (i + x, full != None and l[x] or None)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	229 if i == 0:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	230 break
1308 2073e5a71008 Cleanup of tabs and trailing spaces. Thomas Arendsen Hein <thomas@intevation.de> parents: 1278 diff changeset	231
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	232 # calculate and return the reachability bitmask for sha
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	233 def is_reachable(ar, reachable, sha):
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	234 if len(ar) == 0:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	235 return 1
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	236 mask = 0
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	237 for i in range(len(ar)):
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	238 if sha in reachable[i]:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	239 mask \|= 1 << i
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	240
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	241 return mask
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	242
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	243 reachable = []
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	244 stop_sha1 = []
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	245 want_sha1 = []
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	246 count = 0
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	247
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	248 # figure out which commits they are asking for and which ones they
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	249 # want us to stop on
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	250 for i in range(len(args)):
720 095dd8c757e0 Change hgit revision lookup to use repo.lookup mason@suse.com parents: 719 diff changeset	251 if args[i].startswith('^'):
095dd8c757e0 Change hgit revision lookup to use repo.lookup mason@suse.com parents: 719 diff changeset	252 s = repo.lookup(args[i][1:])
095dd8c757e0 Change hgit revision lookup to use repo.lookup mason@suse.com parents: 719 diff changeset	253 stop_sha1.append(s)
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	254 want_sha1.append(s)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	255 elif args[i] != 'HEAD':
720 095dd8c757e0 Change hgit revision lookup to use repo.lookup mason@suse.com parents: 719 diff changeset	256 want_sha1.append(repo.lookup(args[i]))
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	257
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	258 # calculate the graph for the supplied commits
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	259 for i in range(len(want_sha1)):
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	260 reachable.append({});
720 095dd8c757e0 Change hgit revision lookup to use repo.lookup mason@suse.com parents: 719 diff changeset	261 n = want_sha1[i];
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	262 visit = [n];
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	263 reachable[i][n] = 1
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	264 while visit:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	265 n = visit.pop(0)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	266 if n in stop_sha1:
1243 9d10f89b75a5 Fix hgit revtree bug with stop revision handling root@coffee.suse.com parents: 1239 diff changeset	267 continue
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	268 for p in repo.changelog.parents(n):
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	269 if p not in reachable[i]:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	270 reachable[i][p] = 1
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	271 visit.append(p)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	272 if p in stop_sha1:
1243 9d10f89b75a5 Fix hgit revtree bug with stop revision handling root@coffee.suse.com parents: 1239 diff changeset	273 continue
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	274
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	275 # walk the repository looking for commits that are in our
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	276 # reachability graph
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	277 #for i in range(repo.changelog.count()-1, -1, -1):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	278 for i, changes in chlogwalk():
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	279 n = repo.changelog.node(i)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	280 mask = is_reachable(want_sha1, reachable, n)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	281 if mask:
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	282 parentstr = ""
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	283 if parents:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	284 pp = repo.changelog.parents(n)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	285 if pp[0] != hg.nullid:
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	286 parentstr += " " + hg.short(pp[0])
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	287 if pp[1] != hg.nullid:
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	288 parentstr += " " + hg.short(pp[1])
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	289 if not full:
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	290 print hg.short(n) + parentstr
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	291 elif full is "commit":
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	292 print hg.short(n) + parentstr
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	293 catcommit(repo, n, ' ', changes)
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	294 else:
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	295 (p1, p2) = repo.changelog.parents(n)
3059 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 3012 diff changeset	296 (h, h1, h2) = map(hg.short, (n, p1, p2))
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	297 (i1, i2) = map(repo.changelog.rev, (p1, p2))
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	298
1344 ca0e27e05de3 Fix hgk for date handling changes mpm@selenic.com parents: 1308 diff changeset	299 date = changes[2][0]
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	300 print "%s %s:%s" % (date, h, mask),
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	301 mask = is_reachable(want_sha1, reachable, p1)
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	302 if i1 != -1 and mask > 0:
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	303 print "%s:%s " % (h1, mask),
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	304 mask = is_reachable(want_sha1, reachable, p2)
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	305 if i2 != -1 and mask > 0:
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	306 print "%s:%s " % (h2, mask),
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	307 print ""
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	308 if maxnr and count >= maxnr:
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	309 break
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	310 count += 1
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	311
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	312 # git rev-list tries to order things by date, and has the ability to stop
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	313 # at a given commit without walking the whole repo. TODO add the stop
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	314 # parameter
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	315 def revlist(ui, repo, revs, *opts):
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	316 """print revisions"""
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	317 if opts['header']:
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	318 full = "commit"
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	319 else:
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	320 full = None
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	321 copy = [x for x in revs]
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	322 revtree(copy, repo, full, opts['max_count'], opts['parents'])
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	323
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	324 def view(ui, repo, *etc):
6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	325 "start interactive history viewer"
6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	326 os.chdir(repo.root)
1345 c5594ff3f95c hgk: Allow specifying hgk path in [hgk]path mpm@selenic.com parents: 1344 diff changeset	327 os.system(ui.config("hgk", "path", "hgk") + " " + " ".join(etc))
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	328
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	329 cmdtable = {
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	330 "view": (view, [], 'hg view'),
6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	331 "debug-diff-tree": (difftree, [('p', 'patch', None, 'generate patch'),
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	332 ('r', 'recursive', None, 'recursive'),
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	333 ('P', 'pretty', None, 'pretty'),
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	334 ('s', 'stdin', None, 'stdin'),
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	335 ('C', 'copy', None, 'detect copies'),
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	336 ('S', 'search', "", 'search')],
3063 aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	337 "hg git-diff-tree [options] node1 node2 [files...]"),
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	338 "debug-cat-file": (catfile, [('s', 'stdin', None, 'stdin')],
6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	339 "hg debug-cat-file [options] type file"),
6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	340 "debug-merge-base": (base, [], "hg debug-merge-base node node"),
6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	341 "debug-rev-list": (revlist, [('H', 'header', None, 'header'),
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	342 ('t', 'topo-order', None, 'topo-order'),
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	343 ('p', 'parents', None, 'parents'),
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	344 ('n', 'max-count', 0, 'max-count')],
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	345 "hg debug-rev-list [options] revs"),
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	346 }

Mercurial > public > mercurial-scm > hg

annotate hgext/hgk.py @ 3063:aa1cee5b8afb