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

annotate hgext/hgk.py @ 13741:b51bf961b3cb

wireproto: add getbundle() function getbundle(common, heads) -> bundle Returns the changegroup for all ancestors of heads which are not ancestors of common. For both sets, the heads are included in the set. Intended to eventually supercede changegroupsubset and changegroup. Uses heads of common region to exclude unwanted changesets instead of bases of desired region, which is more useful and easier to implement. Designed to be extensible with new optional arguments (which will have to be guarded by corresponding capabilities).

author	Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date	Wed, 23 Mar 2011 16:02:11 +0100
parents	3da456d0c885
children	a90131b85fd8

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 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 7992 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9467 diff changeset	6 # GNU General Public License version 2 or any later version.
8228 eee2319c5895 add blank line after copyright notices and after header Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	7
8894 868670dbc237 extensions: improve the consistency of synopses C?dric Duval <cedricduval@free.fr> parents: 8866 diff changeset	8 '''browse the repository in a graphical way
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	9
9261 1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	10 The hgk extension allows browsing the history of a repository in a
1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	11 graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not
1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	12 distributed with Mercurial.)
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	13
9261 1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	14 hgk consists of two parts: a Tcl script that does the displaying and
1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	15 querying of information, and an extension to Mercurial named hgk.py,
1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	16 which provides hooks for hgk to get information. hgk can be found in
1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	17 the contrib directory, and the extension is shipped in the hgext
1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	18 repository, and needs to be enabled.
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	19
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 10394 diff changeset	20 The :hg:`view` command will launch the hgk Tcl script. For this command
9261 1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	21 to work, hgk must be in your search path. Alternately, you can specify
12083 ebfc46929f3e help: refer to user configuration file more consistently Brodie Rao <brodie@bitheap.org> parents: 11321 diff changeset	22 the path to hgk in your configuration file::
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	23
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	24 [hgk]
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	25 path=/location/of/hgk
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	26
9261 1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	27 hgk can make use of the extdiff extension to visualize revisions.
1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	28 Assuming you had already configured extdiff vdiff command, just add::
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	29
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	30 [hgk]
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	31 vdiff=vdiff
53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6616 diff changeset	32
9261 1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	33 Revisions context menu will now display additional entries to fire
1a9a650004b6 hgk: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9209 diff changeset	34 vdiff on hovered and selected revisions.
9063 0772889d8a65 hgk: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8946 diff changeset	35 '''
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	36
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	37 import os
6599 cd4db3999ef9 status: use match helpers for various users Matt Mackall <mpm@selenic.com> parents: 6217 diff changeset	38 from mercurial import commands, util, patch, revlog, cmdutil
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	39 from mercurial.node import nullid, nullrev, short
6958 e01ed40a31a2 i18n: mark strings for translation in hgk extension Martin Geisler <mg@daimi.au.dk> parents: 6812 diff changeset	40 from mercurial.i18n import _
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	41
3063 aa1cee5b8afb hgk.py: add an optional file list to debug-diff-tree Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3059 diff changeset	42 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	43 """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	44 def __difftree(repo, node1, node2, files=[]):
3978 ee5663cb4406 hgk: remove unused code, node2 is always set Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	45 assert node2 is not None
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6666 diff changeset	46 mmap = repo[node1].manifest()
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6666 diff changeset	47 mmap2 = repo[node2].manifest()
6616 e9dfe4e3ee6f hgk: difftree must match all files when supplied list is empty Patrick Mezard <pmezard@gmail.com> parents: 6603 diff changeset	48 m = cmdutil.match(repo, files)
6760 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	49 modified, added, removed = repo.status(node1, node2, m)[:3]
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	50 empty = short(nullid)
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	51
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	52 for f in modified:
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	53 # TODO get file permissions
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	54 ui.write(":100664 100664 %s %s M\t%s\t%s\n" %
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	55 (short(mmap[f]), short(mmap2[f]), 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	56 for f in added:
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	57 ui.write(":000000 100664 %s %s N\t%s\t%s\n" %
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	58 (empty, short(mmap2[f]), 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	59 for f in removed:
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	60 ui.write(":100664 000000 %s %s D\t%s\t%s\n" %
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	61 (short(mmap[f]), empty, f, f))
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	62 ##
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	63
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	64 while True:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	65 if opts['stdin']:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	66 try:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	67 line = raw_input().split(' ')
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	68 node1 = line[0]
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	69 if len(line) > 1:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	70 node2 = line[1]
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	71 else:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	72 node2 = None
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	73 except EOFError:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	74 break
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	75 node1 = repo.lookup(node1)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	76 if node2:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	77 node2 = repo.lookup(node2)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	78 else:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	79 node2 = node1
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	80 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	81 if opts['patch']:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	82 if opts['pretty']:
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	83 catcommit(ui, repo, node2, "")
6616 e9dfe4e3ee6f hgk: difftree must match all files when supplied list is empty Patrick Mezard <pmezard@gmail.com> parents: 6603 diff changeset	84 m = cmdutil.match(repo, files)
7308 b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7000 diff changeset	85 chunks = patch.diff(repo, node1, node2, match=m,
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7000 diff changeset	86 opts=patch.diffopts(ui, {'git': True}))
b6f5490effbf patch: turn patch.diff() into a generator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7000 diff changeset	87 for chunk in chunks:
8615 94ca38e63576 use ui instead of repo.ui when the former is in scope Martin Geisler <mg@lazybytes.net> parents: 8459 diff changeset	88 ui.write(chunk)
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	89 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	90 __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	91 if not opts['stdin']:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	92 break
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	93
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	94 def catcommit(ui, repo, n, prefix, ctx=None):
10394 4612cded5176 fix coding style (reported by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	95 nlprefix = '\n' + prefix
3979 e0d13267f7a4 hgk: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3978 diff changeset	96 if ctx is None:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6666 diff changeset	97 ctx = repo[n]
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	98 ui.write("tree %s\n" % short(ctx.changeset()[0])) # use ctx.node() instead ??
6768 e3bb005373b1 hgk: fix parent breakage Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	99 for p in ctx.parents():
e3bb005373b1 hgk: fix parent breakage Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	100 ui.write("parent %s\n" % p)
e3bb005373b1 hgk: fix parent breakage Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	101
3979 e0d13267f7a4 hgk: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3978 diff changeset	102 date = ctx.date()
4039 cc08d2543593 hgk: remove embedded nulls in descriptions Matt Mackall <mpm@selenic.com> parents: 3981 diff changeset	103 description = ctx.description().replace("\0", "")
3979 e0d13267f7a4 hgk: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3978 diff changeset	104 lines = description.splitlines()
2525 c49dc6f38a19 hgk: Don't choke on empty changelogs Brendan Cully <brendan@kublai.com> parents: 2432 diff changeset	105 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	106 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	107 else:
3979 e0d13267f7a4 hgk: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3978 diff changeset	108 committer = ctx.user()
1308 2073e5a71008 Cleanup of tabs and trailing spaces. Thomas Arendsen Hein <thomas@intevation.de> parents: 1278 diff changeset	109
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	110 ui.write("author %s %s %s\n" % (ctx.user(), int(date[0]), date[1]))
d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	111 ui.write("committer %s %s %s\n" % (committer, int(date[0]), date[1]))
d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	112 ui.write("revision %d\n" % ctx.rev())
d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	113 ui.write("branch %s\n\n" % ctx.branch())
d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	114
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	115 if prefix != "":
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	116 ui.write("%s%s\n" % (prefix, description.replace('\n', nlprefix).strip()))
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	117 else:
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	118 ui.write(description + "\n")
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	119 if prefix:
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	120 ui.write('\0')
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	121
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	122 def base(ui, repo, node1, node2):
7598 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7308 diff changeset	123 """output common ancestor information"""
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	124 node1 = repo.lookup(node1)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	125 node2 = repo.lookup(node2)
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	126 n = repo.changelog.ancestor(node1, node2)
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	127 ui.write(short(n) + "\n")
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	128
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	129 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	130 """cat a specific revision"""
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	131 # 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	132 # 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	133 # strings
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	134 #
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	135 prefix = ""
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	136 if opts['stdin']:
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	137 try:
10394 4612cded5176 fix coding style (reported by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	138 (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	139 prefix = " "
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	140 except EOFError:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	141 return
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	142
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	143 else:
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	144 if not type or not r:
6958 e01ed40a31a2 i18n: mark strings for translation in hgk extension Martin Geisler <mg@daimi.au.dk> parents: 6812 diff changeset	145 ui.warn(_("cat-file: type or revision not supplied\n"))
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	146 commands.help_(ui, 'cat-file')
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	147
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	148 while r:
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	149 if type != "commit":
6958 e01ed40a31a2 i18n: mark strings for translation in hgk extension Martin Geisler <mg@daimi.au.dk> parents: 6812 diff changeset	150 ui.warn(_("aborting hg cat-file only understands commits\n"))
10394 4612cded5176 fix coding style (reported by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	151 return 1
720 095dd8c757e0 Change hgit revision lookup to use repo.lookup mason@suse.com parents: 719 diff changeset	152 n = repo.lookup(r)
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	153 catcommit(ui, repo, n, prefix)
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	154 if opts['stdin']:
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	155 try:
10394 4612cded5176 fix coding style (reported by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	156 (type, r) = raw_input().split(' ')
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	157 except EOFError:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	158 break
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	159 else:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	160 break
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	161
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	162 # 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	163 # 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	164 # telling you which commits are reachable from the supplied ones via
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	165 # a bitmask based on arg position.
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	166 # you can specify a commit to stop at by starting the sha1 with ^
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	167 def revtree(ui, args, repo, full="tree", maxnr=0, parents=False):
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	168 def chlogwalk():
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	169 count = len(repo)
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	170 i = count
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	171 l = [0] * 100
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	172 chunk = 100
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	173 while True:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	174 if chunk > i:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	175 chunk = i
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	176 i = 0
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	177 else:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	178 i -= chunk
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	179
8624 2b3dec0ef3ae replace xrange(0, n) with xrange(n) Martin Geisler <mg@lazybytes.net> parents: 8615 diff changeset	180 for x in xrange(chunk):
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	181 if i + x >= count:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	182 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	183 break
13031 3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons Martin Geisler <mg@aragost.com> parents: 12083 diff changeset	184 if full is not None:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6666 diff changeset	185 l[x] = repo[i + x]
3981 180670f14045 hgk: (re)optimize reading of changelog and manifest Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3979 diff changeset	186 l[x].changeset() # force reading
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	187 else:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	188 l[x] = 1
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	189 for x in xrange(chunk - 1, -1, -1):
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	190 if l[x] != 0:
13031 3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons Martin Geisler <mg@aragost.com> parents: 12083 diff changeset	191 yield (i + x, full is not None and l[x] or None)
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	192 if i == 0:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	193 break
1308 2073e5a71008 Cleanup of tabs and trailing spaces. Thomas Arendsen Hein <thomas@intevation.de> parents: 1278 diff changeset	194
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	195 # calculate and return the reachability bitmask for sha
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	196 def is_reachable(ar, reachable, sha):
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	197 if len(ar) == 0:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	198 return 1
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	199 mask = 0
3473 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	200 for i in xrange(len(ar)):
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	201 if sha in reachable[i]:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	202 mask \|= 1 << i
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	203
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	204 return mask
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	205
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	206 reachable = []
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	207 stop_sha1 = []
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	208 want_sha1 = []
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	209 count = 0
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	210
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	211 # 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	212 # want us to stop on
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	213 for i, arg in enumerate(args):
9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	214 if arg.startswith('^'):
9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	215 s = repo.lookup(arg[1:])
720 095dd8c757e0 Change hgit revision lookup to use repo.lookup mason@suse.com parents: 719 diff changeset	216 stop_sha1.append(s)
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	217 want_sha1.append(s)
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	218 elif arg != 'HEAD':
9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	219 want_sha1.append(repo.lookup(arg))
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	220
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	221 # calculate the graph for the supplied commits
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8624 diff changeset	222 for i, n in enumerate(want_sha1):
10394 4612cded5176 fix coding style (reported by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	223 reachable.append(set())
4612cded5176 fix coding style (reported by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	224 visit = [n]
8459 1e63816ce8a2 hgk: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8228 diff changeset	225 reachable[i].add(n)
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	226 while visit:
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	227 n = visit.pop(0)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	228 if n in stop_sha1:
1243 9d10f89b75a5 Fix hgit revtree bug with stop revision handling root@coffee.suse.com parents: 1239 diff changeset	229 continue
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	230 for p in repo.changelog.parents(n):
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	231 if p not in reachable[i]:
8459 1e63816ce8a2 hgk: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8228 diff changeset	232 reachable[i].add(p)
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	233 visit.append(p)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	234 if p in stop_sha1:
1243 9d10f89b75a5 Fix hgit revtree bug with stop revision handling root@coffee.suse.com parents: 1239 diff changeset	235 continue
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	236
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	237 # walk the repository looking for commits that are in our
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	238 # reachability graph
3979 e0d13267f7a4 hgk: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3978 diff changeset	239 for i, ctx in chlogwalk():
334 290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	240 n = repo.changelog.node(i)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	241 mask = is_reachable(want_sha1, reachable, n)
290574209284 hgit: remove tabs mpm@selenic.com parents: 280 diff changeset	242 if mask:
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	243 parentstr = ""
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	244 if parents:
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	245 pp = repo.changelog.parents(n)
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	246 if pp[0] != nullid:
fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	247 parentstr += " " + short(pp[0])
fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	248 if pp[1] != nullid:
fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	249 parentstr += " " + short(pp[1])
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	250 if not full:
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	251 ui.write("%s%s\n" % (short(n), parentstr))
3064 fe5c92529d1c hgk.py: fix warnings from pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3063 diff changeset	252 elif full == "commit":
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	253 ui.write("%s%s\n" % (short(n), parentstr))
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	254 catcommit(ui, repo, n, ' ', ctx)
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	255 else:
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	256 (p1, p2) = repo.changelog.parents(n)
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	257 (h, h1, h2) = map(short, (n, p1, p2))
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	258 (i1, i2) = map(repo.changelog.rev, (p1, p2))
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	259
3979 e0d13267f7a4 hgk: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3978 diff changeset	260 date = ctx.date()[0]
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	261 ui.write("%s %s:%s" % (date, h, mask))
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	262 mask = is_reachable(want_sha1, reachable, p1)
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	263 if i1 != nullrev and mask > 0:
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	264 ui.write("%s:%s " % (h1, mask)),
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	265 mask = is_reachable(want_sha1, reachable, p2)
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	266 if i2 != nullrev and mask > 0:
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	267 ui.write("%s:%s " % (h2, mask))
d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	268 ui.write("\n")
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	269 if maxnr and count >= maxnr:
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	270 break
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	271 count += 1
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	272
3093 edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	273 def revparse(ui, repo, revs, *opts):
7598 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7308 diff changeset	274 """parse given revisions"""
3093 edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	275 def revstr(rev):
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	276 if rev == 'HEAD':
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	277 rev = 'tip'
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	278 return revlog.hex(repo.lookup(rev))
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	279
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	280 for r in revs:
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	281 revrange = r.split(':', 1)
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	282 ui.write('%s\n' % revstr(revrange[0]))
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	283 if len(revrange) == 2:
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	284 ui.write('^%s\n' % revstr(revrange[1]))
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	285
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	286 # 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	287 # 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	288 # parameter
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	289 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	290 """print revisions"""
29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	291 if opts['header']:
356 7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	292 full = "commit"
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	293 else:
7dec9a46d82a hgit rev-list support mpm@selenic.com parents: 350 diff changeset	294 full = None
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	295 copy = [x for x in revs]
5878 d39af2eabb8c transform a bunch of print statements to appropriate ui calls Matt Mackall <mpm@selenic.com> parents: 5859 diff changeset	296 revtree(ui, copy, repo, full, opts['max_count'], opts['parents'])
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	297
5393 c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 4730 diff changeset	298 def config(ui, repo, **opts):
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 4730 diff changeset	299 """print extension options"""
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 4730 diff changeset	300 def writeopt(name, value):
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5395 diff changeset	301 ui.write('k=%s\nv=%s\n' % (name, value))
5393 c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 4730 diff changeset	302
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 4730 diff changeset	303 writeopt('vdiff', ui.config('hgk', 'vdiff', ''))
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5395 diff changeset	304
5393 c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 4730 diff changeset	305
3093 edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	306 def view(ui, repo, etc, *opts):
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	307 "start interactive history viewer"
6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	308 os.chdir(repo.root)
3180 eb0906ebba81 hgk: fix mixup of --limit and REVRANGE in hgk call TK Soh <teekaysoh@yahoo.com> parents: 3093 diff changeset	309 optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
eb0906ebba81 hgk: fix mixup of --limit and REVRANGE in hgk call TK Soh <teekaysoh@yahoo.com> parents: 3093 diff changeset	310 cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9261 diff changeset	311 ui.debug("running %s\n" % cmd)
4688 39001f4b7d99 hgk: Use $HG instead of hg (see 849f011dbf79) Thomas Arendsen Hein <thomas@intevation.de> parents: 4039 diff changeset	312 util.system(cmd)
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1243 diff changeset	313
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	314 cmdtable = {
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	315 "^view":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	316 (view,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11193 diff changeset	317 [('l', 'limit', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11193 diff changeset	318 _('limit number of changes displayed'), _('NUM'))],
7000 af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	319 _('hg view [-l LIMIT] [REVRANGE]')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	320 "debug-diff-tree":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	321 (difftree,
7000 af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	322 [('p', 'patch', None, _('generate patch')),
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	323 ('r', 'recursive', None, _('recursive')),
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	324 ('P', 'pretty', None, _('pretty')),
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	325 ('s', 'stdin', None, _('stdin')),
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	326 ('C', 'copy', None, _('detect copies')),
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	327 ('S', 'search', "", _('search'))],
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	328 _('hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]...')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	329 "debug-cat-file":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	330 (catfile,
7000 af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	331 [('s', 'stdin', None, _('stdin'))],
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	332 _('hg debug-cat-file [OPTION]... TYPE FILE')),
5393 c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 4730 diff changeset	333 "debug-config":
7000 af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	334 (config, [], _('hg debug-config')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	335 "debug-merge-base":
8946 576623f95972 hgk: standardize cmdline help strings Martin Geisler <mg@lazybytes.net> parents: 8894 diff changeset	336 (base, [], _('hg debug-merge-base REV REV')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	337 "debug-rev-parse":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	338 (revparse,
7000 af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	339 [('', 'default', '', _('ignored'))],
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	340 _('hg debug-rev-parse REV')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	341 "debug-rev-list":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4688 diff changeset	342 (revlist,
7000 af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	343 [('H', 'header', None, _('header')),
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	344 ('t', 'topo-order', None, _('topo-order')),
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	345 ('p', 'parents', None, _('parents')),
af694c6a888c i18n, hgk: mark command line options for translation Martin Geisler <mg@daimi.au.dk> parents: 6958 diff changeset	346 ('n', 'max-count', 0, _('max-count'))],
8946 576623f95972 hgk: standardize cmdline help strings Martin Geisler <mg@lazybytes.net> parents: 8894 diff changeset	347 _('hg debug-rev-list [OPTION]... REV...')),
1239 29f17e083e84 Turn hgit into an extension, and add commands supporting the latest gitk mason@suse.com parents: 740 diff changeset	348 }

Mercurial > public > mercurial-scm > hg

annotate hgext/hgk.py @ 13741:b51bf961b3cb