Mercurial > hg
annotate hgext/hgk.py @ 6157:09b00faa8670
keyword: remove "identify" and "remove" from nokwcommands
These two commands care about the list of modified files returned
by repo.status and we may need to do a full content comparison to
populate that list.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 21 Feb 2008 16:22:31 -0300 |
parents | d39af2eabb8c |
children | e75aab656f46 |
rev | line source |
---|---|
267 | 1 # Minimal support for git commands on an hg repository |
2 # | |
2859 | 3 # Copyright 2005, 2006 Chris Mason <mason@suse.com> |
267 | 4 # |
5 # This software may be used and distributed according to the terms | |
6 # of the GNU General Public License, incorporated herein by reference. | |
5395
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
7 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
8 # The hgk extension allows browsing the history of a repository in a |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
9 # graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
10 # not distributed with Mercurial.) |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
11 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
12 # hgk consists of two parts: a Tcl script that does the displaying and |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
13 # querying of information, and an extension to mercurial named hgk.py, |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
14 # which provides hooks for hgk to get information. hgk can be found in |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
15 # the contrib directory, and hgk.py can be found in the hgext |
5760
0145f9afb0e7
Removed tabs and trailing whitespace in python files
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5395
diff
changeset
|
16 # directory. |
5395
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
17 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
18 # To load the hgext.py extension, add it to your .hgrc file (you have |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
19 # to use your global $HOME/.hgrc file, not one in a repository). You |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
20 # can specify an absolute path: |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
21 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
22 # [extensions] |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
23 # hgk=/usr/local/lib/hgk.py |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
24 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
25 # Mercurial can also scan the default python library path for a file |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
26 # named 'hgk.py' if you set hgk empty: |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
27 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
28 # [extensions] |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
29 # hgk= |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
30 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
31 # The hg view command will launch the hgk Tcl script. For this command |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
32 # to work, hgk must be in your search path. Alternately, you can |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
33 # specify the path to hgk in your .hgrc file: |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
34 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
35 # [hgk] |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
36 # path=/location/of/hgk |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
37 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
38 # hgk can make use of the extdiff extension to visualize |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
39 # revisions. Assuming you had already configured extdiff vdiff |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
40 # command, just add: |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
41 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
42 # [hgk] |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
43 # vdiff=vdiff |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
44 # |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
45 # Revisions context menu will now display additional entries to fire |
e73a83af7926
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com>
parents:
5393
diff
changeset
|
46 # vdiff on hovered and selected revisions. |
267 | 47 |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
48 import os |
3877
abaee83ce0a6
Replace demandload with new demandimport
Matt Mackall <mpm@selenic.com>
parents:
3800
diff
changeset
|
49 from mercurial import hg, fancyopts, commands, ui, util, patch, revlog |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
50 |
3063
aa1cee5b8afb
hgk.py: add an optional file list to debug-diff-tree
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3059
diff
changeset
|
51 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
|
52 """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
|
53 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
|
54 assert node2 is not None |
3981
180670f14045
hgk: (re)optimize reading of changelog and manifest
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3979
diff
changeset
|
55 mmap = repo.changectx(node1).manifest() |
3979
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
56 mmap2 = repo.changectx(node2).manifest() |
3978
ee5663cb4406
hgk: remove unused code, node2 is always set
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3963
diff
changeset
|
57 status = repo.status(node1, node2, files=files)[:5] |
ee5663cb4406
hgk: remove unused code, node2 is always set
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3963
diff
changeset
|
58 modified, added, removed, deleted, unknown = status |
267 | 59 |
3069
c6bfe536a1f9
hgk.py: fix for a bug introduced in 32fd512ca7c0
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3067
diff
changeset
|
60 empty = hg.short(hg.nullid) |
267 | 61 |
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
|
62 for f in modified: |
334 | 63 # 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
|
64 ui.write(":100664 100664 %s %s M\t%s\t%s\n" % |
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
65 (hg.short(mmap[f]), hg.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
|
66 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
|
67 ui.write(":000000 100664 %s %s N\t%s\t%s\n" % |
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
68 (empty, hg.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
|
69 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
|
70 ui.write(":100664 000000 %s %s D\t%s\t%s\n" % |
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
71 (hg.short(mmap[f]), empty, f, f)) |
267 | 72 ## |
73 | |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
74 while True: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
75 if opts['stdin']: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
76 try: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
77 line = raw_input().split(' ') |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
78 node1 = line[0] |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
79 if len(line) > 1: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
80 node2 = line[1] |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
81 else: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
82 node2 = None |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
83 except EOFError: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
84 break |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
85 node1 = repo.lookup(node1) |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
86 if node2: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
87 node2 = repo.lookup(node2) |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
88 else: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
89 node2 = node1 |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
90 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
|
91 if opts['patch']: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
92 if opts['pretty']: |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
93 catcommit(ui, repo, node2, "") |
3067
fbd3f9fd645d
hgk.py: use mercurial.patch functions when possible
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3065
diff
changeset
|
94 patch.diff(repo, node1, node2, |
fbd3f9fd645d
hgk.py: use mercurial.patch functions when possible
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3065
diff
changeset
|
95 files=files, |
fbd3f9fd645d
hgk.py: use mercurial.patch functions when possible
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3065
diff
changeset
|
96 opts=patch.diffopts(ui, {'git': True})) |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
97 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
|
98 __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
|
99 if not opts['stdin']: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
100 break |
267 | 101 |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
102 def catcommit(ui, repo, n, prefix, ctx=None): |
267 | 103 nlprefix = '\n' + prefix; |
3979
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
104 if ctx is None: |
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
105 ctx = repo.changectx(n) |
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
106 (p1, p2) = ctx.parents() |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
107 ui.write("tree %s\n" % hg.short(ctx.changeset()[0])) # use ctx.node() instead ?? |
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
108 if p1: ui.write("parent %s\n" % hg.short(p1.node())) |
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
109 if p2: ui.write("parent %s\n" % hg.short(p2.node())) |
3979
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
110 date = ctx.date() |
4039
cc08d2543593
hgk: remove embedded nulls in descriptions
Matt Mackall <mpm@selenic.com>
parents:
3981
diff
changeset
|
111 description = ctx.description().replace("\0", "") |
3979
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
112 lines = description.splitlines() |
2525
c49dc6f38a19
hgk: Don't choke on empty changelogs
Brendan Cully <brendan@kublai.com>
parents:
2432
diff
changeset
|
113 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
|
114 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
|
115 else: |
3979
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
116 committer = ctx.user() |
1308
2073e5a71008
Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1278
diff
changeset
|
117 |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
118 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
|
119 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
|
120 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
|
121 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
|
122 |
267 | 123 if prefix != "": |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
124 ui.write("%s%s\n" % (prefix, description.replace('\n', nlprefix).strip())) |
267 | 125 else: |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
126 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
|
127 if prefix: |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
128 ui.write('\0') |
267 | 129 |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
130 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
|
131 """Output common ancestor information""" |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
132 node1 = repo.lookup(node1) |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
133 node2 = repo.lookup(node2) |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
134 n = repo.changelog.ancestor(node1, node2) |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
135 ui.write(hg.short(n) + "\n") |
267 | 136 |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
137 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
|
138 """cat a specific revision""" |
267 | 139 # in stdin mode, every line except the commit is prefixed with two |
140 # spaces. This way the our caller can find the commit without magic | |
141 # strings | |
142 # | |
143 prefix = "" | |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
144 if opts['stdin']: |
334 | 145 try: |
146 (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
|
147 prefix = " " |
334 | 148 except EOFError: |
149 return | |
267 | 150 |
151 else: | |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
152 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
|
153 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
|
154 commands.help_(ui, 'cat-file') |
267 | 155 |
156 while r: | |
334 | 157 if type != "commit": |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
158 ui.warn("aborting hg cat-file only understands commits\n") |
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
159 return 1; |
720
095dd8c757e0
Change hgit revision lookup to use repo.lookup
mason@suse.com
parents:
719
diff
changeset
|
160 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
|
161 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
|
162 if opts['stdin']: |
334 | 163 try: |
164 (type, r) = raw_input().split(' '); | |
165 except EOFError: | |
166 break | |
167 else: | |
168 break | |
267 | 169 |
170 # git rev-tree is a confusing thing. You can supply a number of | |
171 # commit sha1s on the command line, and it walks the commit history | |
172 # telling you which commits are reachable from the supplied ones via | |
173 # a bitmask based on arg position. | |
174 # 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
|
175 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
|
176 def chlogwalk(): |
3979
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
177 count = repo.changelog.count() |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
178 i = count |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
179 l = [0] * 100 |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
180 chunk = 100 |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
181 while True: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
182 if chunk > i: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
183 chunk = i |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
184 i = 0 |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
185 else: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
186 i -= chunk |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
187 |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
188 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
|
189 if i + x >= count: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
190 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
|
191 break |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
192 if full != None: |
3979
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
193 l[x] = repo.changectx(i + x) |
3981
180670f14045
hgk: (re)optimize reading of changelog and manifest
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3979
diff
changeset
|
194 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
|
195 else: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
196 l[x] = 1 |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
197 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
|
198 if l[x] != 0: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
199 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
|
200 if i == 0: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
201 break |
1308
2073e5a71008
Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1278
diff
changeset
|
202 |
267 | 203 # calculate and return the reachability bitmask for sha |
204 def is_reachable(ar, reachable, sha): | |
334 | 205 if len(ar) == 0: |
206 return 1 | |
207 mask = 0 | |
3473
0e68608bd11d
use xrange instead of range
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3180
diff
changeset
|
208 for i in xrange(len(ar)): |
334 | 209 if sha in reachable[i]: |
210 mask |= 1 << i | |
267 | 211 |
334 | 212 return mask |
267 | 213 |
214 reachable = [] | |
215 stop_sha1 = [] | |
216 want_sha1 = [] | |
356 | 217 count = 0 |
267 | 218 |
219 # figure out which commits they are asking for and which ones they | |
220 # want us to stop on | |
3473
0e68608bd11d
use xrange instead of range
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3180
diff
changeset
|
221 for i in xrange(len(args)): |
720
095dd8c757e0
Change hgit revision lookup to use repo.lookup
mason@suse.com
parents:
719
diff
changeset
|
222 if args[i].startswith('^'): |
095dd8c757e0
Change hgit revision lookup to use repo.lookup
mason@suse.com
parents:
719
diff
changeset
|
223 s = repo.lookup(args[i][1:]) |
095dd8c757e0
Change hgit revision lookup to use repo.lookup
mason@suse.com
parents:
719
diff
changeset
|
224 stop_sha1.append(s) |
334 | 225 want_sha1.append(s) |
226 elif args[i] != 'HEAD': | |
720
095dd8c757e0
Change hgit revision lookup to use repo.lookup
mason@suse.com
parents:
719
diff
changeset
|
227 want_sha1.append(repo.lookup(args[i])) |
356 | 228 |
267 | 229 # calculate the graph for the supplied commits |
3473
0e68608bd11d
use xrange instead of range
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3180
diff
changeset
|
230 for i in xrange(len(want_sha1)): |
334 | 231 reachable.append({}); |
720
095dd8c757e0
Change hgit revision lookup to use repo.lookup
mason@suse.com
parents:
719
diff
changeset
|
232 n = want_sha1[i]; |
334 | 233 visit = [n]; |
234 reachable[i][n] = 1 | |
235 while visit: | |
236 n = visit.pop(0) | |
237 if n in stop_sha1: | |
1243
9d10f89b75a5
Fix hgit revtree bug with stop revision handling
root@coffee.suse.com
parents:
1239
diff
changeset
|
238 continue |
334 | 239 for p in repo.changelog.parents(n): |
240 if p not in reachable[i]: | |
241 reachable[i][p] = 1 | |
242 visit.append(p) | |
243 if p in stop_sha1: | |
1243
9d10f89b75a5
Fix hgit revtree bug with stop revision handling
root@coffee.suse.com
parents:
1239
diff
changeset
|
244 continue |
356 | 245 |
267 | 246 # walk the repository looking for commits that are in our |
247 # reachability graph | |
3979
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
248 for i, ctx in chlogwalk(): |
334 | 249 n = repo.changelog.node(i) |
250 mask = is_reachable(want_sha1, reachable, n) | |
251 if mask: | |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
252 parentstr = "" |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
253 if parents: |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
254 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
|
255 if pp[0] != hg.nullid: |
3059
3dab573a4330
hgk: use short changeset hashes
TK Soh <teekaysoh@yahoo.com>
parents:
3012
diff
changeset
|
256 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
|
257 if pp[1] != hg.nullid: |
3059
3dab573a4330
hgk: use short changeset hashes
TK Soh <teekaysoh@yahoo.com>
parents:
3012
diff
changeset
|
258 parentstr += " " + hg.short(pp[1]) |
356 | 259 if not full: |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
260 ui.write("%s%s\n" % (hg.short(n), parentstr)) |
3064
fe5c92529d1c
hgk.py: fix warnings from pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3063
diff
changeset
|
261 elif full == "commit": |
5878
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
262 ui.write("%s%s\n" % (hg.short(n), parentstr)) |
d39af2eabb8c
transform a bunch of print statements to appropriate ui calls
Matt Mackall <mpm@selenic.com>
parents:
5859
diff
changeset
|
263 catcommit(ui, repo, n, ' ', ctx) |
356 | 264 else: |
265 (p1, p2) = repo.changelog.parents(n) | |
3059
3dab573a4330
hgk: use short changeset hashes
TK Soh <teekaysoh@yahoo.com>
parents:
3012
diff
changeset
|
266 (h, h1, h2) = map(hg.short, (n, p1, p2)) |
356 | 267 (i1, i2) = map(repo.changelog.rev, (p1, p2)) |
267 | 268 |
3979
e0d13267f7a4
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3978
diff
changeset
|
269 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
|
270 ui.write("%s %s:%s" % (date, h, mask)) |
356 | 271 mask = is_reachable(want_sha1, reachable, p1) |
3578
3b4e00cba57a
Define and use nullrev (revision of nullid) instead of -1.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3473
diff
changeset
|
272 if i1 != hg.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
|
273 ui.write("%s:%s " % (h1, mask)), |
356 | 274 mask = is_reachable(want_sha1, reachable, p2) |
3578
3b4e00cba57a
Define and use nullrev (revision of nullid) instead of -1.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3473
diff
changeset
|
275 if i2 != hg.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
|
276 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
|
277 ui.write("\n") |
356 | 278 if maxnr and count >= maxnr: |
279 break | |
280 count += 1 | |
267 | 281 |
3093
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
282 def revparse(ui, repo, *revs, **opts): |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
283 """Parse given revisions""" |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
284 def revstr(rev): |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
285 if rev == 'HEAD': |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
286 rev = 'tip' |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
287 return revlog.hex(repo.lookup(rev)) |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
288 |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
289 for r in revs: |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
290 revrange = r.split(':', 1) |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
291 ui.write('%s\n' % revstr(revrange[0])) |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
292 if len(revrange) == 2: |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
293 ui.write('^%s\n' % revstr(revrange[1])) |
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
294 |
267 | 295 # git rev-list tries to order things by date, and has the ability to stop |
296 # at a given commit without walking the whole repo. TODO add the stop | |
297 # parameter | |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
298 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
|
299 """print revisions""" |
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
300 if opts['header']: |
356 | 301 full = "commit" |
302 else: | |
303 full = None | |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
304 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
|
305 revtree(ui, copy, repo, full, opts['max_count'], opts['parents']) |
267 | 306 |
5393
c2ad1890fc53
hgk: add debug-config command to pass configuration options
Patrick Mezard <pmezard@gmail.com>
parents:
4730
diff
changeset
|
307 def config(ui, repo, **opts): |
c2ad1890fc53
hgk: add debug-config command to pass configuration options
Patrick Mezard <pmezard@gmail.com>
parents:
4730
diff
changeset
|
308 """print extension options""" |
c2ad1890fc53
hgk: add debug-config command to pass configuration options
Patrick Mezard <pmezard@gmail.com>
parents:
4730
diff
changeset
|
309 def writeopt(name, value): |
5760
0145f9afb0e7
Removed tabs and trailing whitespace in python files
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5395
diff
changeset
|
310 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
|
311 |
c2ad1890fc53
hgk: add debug-config command to pass configuration options
Patrick Mezard <pmezard@gmail.com>
parents:
4730
diff
changeset
|
312 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
|
313 |
5393
c2ad1890fc53
hgk: add debug-config command to pass configuration options
Patrick Mezard <pmezard@gmail.com>
parents:
4730
diff
changeset
|
314 |
3093
edefbb3a3b08
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
315 def view(ui, repo, *etc, **opts): |
1278 | 316 "start interactive history viewer" |
317 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
|
318 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
|
319 cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc)) |
eb0906ebba81
hgk: fix mixup of --limit and REVRANGE in hgk call
TK Soh <teekaysoh@yahoo.com>
parents:
3093
diff
changeset
|
320 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
|
321 util.system(cmd) |
1278 | 322 |
1239
29f17e083e84
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com
parents:
740
diff
changeset
|
323 cmdtable = { |
4730
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
324 "^view": |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
325 (view, |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
326 [('l', 'limit', '', 'limit number of changes displayed')], |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
327 'hg view [-l LIMIT] [REVRANGE]'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
328 "debug-diff-tree": |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
329 (difftree, |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
330 [('p', 'patch', None, 'generate patch'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
331 ('r', 'recursive', None, 'recursive'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
332 ('P', 'pretty', None, 'pretty'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
333 ('s', 'stdin', None, 'stdin'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
334 ('C', 'copy', None, 'detect copies'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
335 ('S', 'search', "", 'search')], |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
336 'hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]...'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
337 "debug-cat-file": |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
338 (catfile, |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
339 [('s', 'stdin', None, 'stdin')], |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
340 '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
|
341 "debug-config": |
c2ad1890fc53
hgk: add debug-config command to pass configuration options
Patrick Mezard <pmezard@gmail.com>
parents:
4730
diff
changeset
|
342 (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
|
343 "debug-merge-base": |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
344 (base, [], 'hg debug-merge-base node node'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
345 "debug-rev-parse": |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
346 (revparse, |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
347 [('', 'default', '', 'ignored')], |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
348 'hg debug-rev-parse REV'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
349 "debug-rev-list": |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
350 (revlist, |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
351 [('H', 'header', None, 'header'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
352 ('t', 'topo-order', None, 'topo-order'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
353 ('p', 'parents', None, 'parents'), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
354 ('n', 'max-count', 0, 'max-count')], |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4688
diff
changeset
|
355 '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
|
356 } |