##// END OF EJS Templates
transplant: avoid the word "rebase" when we mean "transplant"
transplant: avoid the word "rebase" when we mean "transplant"

File last commit:

r13031:3da456d0 default
r13606:1532ed1e stable
Show More
hgk.py
348 lines | 11.4 KiB | text/x-python | PythonLexer
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 # Minimal support for git commands on an hg repository
#
Vadim Gelfer
update copyrights.
r2859 # Copyright 2005, 2006 Chris Mason <mason@suse.com>
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Martin Geisler
add blank line after copyright notices and after header
r8228
Cédric Duval
extensions: improve the consistency of synopses...
r8894 '''browse the repository in a graphical way
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
hgk: wrap docstrings at 70 characters
r9261 The hgk extension allows browsing the history of a repository in a
graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not
distributed with Mercurial.)
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
hgk: wrap docstrings at 70 characters
r9261 hgk consists of two parts: a Tcl script that does the displaying and
querying of information, and an extension to Mercurial named hgk.py,
which provides hooks for hgk to get information. hgk can be found in
the contrib directory, and the extension is shipped in the hgext
repository, and needs to be enabled.
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
Martin Geisler
Use our custom hg reStructuredText role some more...
r11193 The :hg:`view` command will launch the hgk Tcl script. For this command
Martin Geisler
hgk: wrap docstrings at 70 characters
r9261 to work, hgk must be in your search path. Alternately, you can specify
Brodie Rao
help: refer to user configuration file more consistently...
r12083 the path to hgk in your configuration file::
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
[hgk]
path=/location/of/hgk
Martin Geisler
hgk: wrap docstrings at 70 characters
r9261 hgk can make use of the extdiff extension to visualize revisions.
Assuming you had already configured extdiff vdiff command, just add::
Dirkjan Ochtman
convert comments to docstrings in a bunch of extensions
r6666
[hgk]
vdiff=vdiff
Martin Geisler
hgk: wrap docstrings at 70 characters
r9261 Revisions context menu will now display additional entries to fire
vdiff on hovered and selected revisions.
Martin Geisler
hgk: wrapped docstrings at 78 characters
r9063 '''
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 import os
Matt Mackall
status: use match helpers for various users
r6599 from mercurial import commands, util, patch, revlog, cmdutil
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 from mercurial.node import nullid, nullrev, short
Martin Geisler
i18n: mark strings for translation in hgk extension
r6958 from mercurial.i18n import _
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432
Benoit Boissinot
hgk.py: add an optional file list to debug-diff-tree...
r3063 def difftree(ui, repo, node1=None, node2=None, *files, **opts):
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 """diff trees from two commits"""
Benoit Boissinot
hgk.py: add an optional file list to debug-diff-tree...
r3063 def __difftree(repo, node1, node2, files=[]):
Benoit Boissinot
hgk: remove unused code, node2 is always set
r3978 assert node2 is not None
Matt Mackall
use repo[changeid] to get a changectx
r6747 mmap = repo[node1].manifest()
mmap2 = repo[node2].manifest()
Patrick Mezard
hgk: difftree must match all files when supplied list is empty
r6616 m = cmdutil.match(repo, files)
Matt Mackall
status: clean up all users for unknown files
r6760 modified, added, removed = repo.status(node1, node2, m)[:3]
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 empty = short(nullid)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432
for f in modified:
# TODO get file permissions
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write(":100664 100664 %s %s M\t%s\t%s\n" %
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 (short(mmap[f]), short(mmap2[f]), f, f))
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 for f in added:
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write(":000000 100664 %s %s N\t%s\t%s\n" %
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 (empty, short(mmap2[f]), f, f))
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 for f in removed:
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write(":100664 000000 %s %s D\t%s\t%s\n" %
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 (short(mmap[f]), empty, f, f))
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 ##
while True:
if opts['stdin']:
try:
line = raw_input().split(' ')
node1 = line[0]
if len(line) > 1:
node2 = line[1]
else:
node2 = None
except EOFError:
break
node1 = repo.lookup(node1)
if node2:
node2 = repo.lookup(node2)
else:
node2 = node1
node1 = repo.changelog.parents(node1)[0]
if opts['patch']:
if opts['pretty']:
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 catcommit(ui, repo, node2, "")
Patrick Mezard
hgk: difftree must match all files when supplied list is empty
r6616 m = cmdutil.match(repo, files)
Dirkjan Ochtman
patch: turn patch.diff() into a generator...
r7308 chunks = patch.diff(repo, node1, node2, match=m,
opts=patch.diffopts(ui, {'git': True}))
for chunk in chunks:
Martin Geisler
use ui instead of repo.ui when the former is in scope
r8615 ui.write(chunk)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 else:
Benoit Boissinot
hgk.py: add an optional file list to debug-diff-tree...
r3063 __difftree(repo, node1, node2, files=files)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if not opts['stdin']:
break
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 def catcommit(ui, repo, n, prefix, ctx=None):
Benoit Boissinot
fix coding style (reported by pylint)
r10394 nlprefix = '\n' + prefix
Benoit Boissinot
hgk: use contexts
r3979 if ctx is None:
Matt Mackall
use repo[changeid] to get a changectx
r6747 ctx = repo[n]
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 ui.write("tree %s\n" % short(ctx.changeset()[0])) # use ctx.node() instead ??
Matt Mackall
hgk: fix parent breakage
r6768 for p in ctx.parents():
ui.write("parent %s\n" % p)
Benoit Boissinot
hgk: use contexts
r3979 date = ctx.date()
Matt Mackall
hgk: remove embedded nulls in descriptions
r4039 description = ctx.description().replace("\0", "")
Benoit Boissinot
hgk: use contexts
r3979 lines = description.splitlines()
Brendan Cully
hgk: Don't choke on empty changelogs
r2525 if lines and lines[-1].startswith('committer:'):
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 committer = lines[-1].split(': ')[1].rstrip()
else:
Benoit Boissinot
hgk: use contexts
r3979 committer = ctx.user()
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write("author %s %s %s\n" % (ctx.user(), int(date[0]), date[1]))
ui.write("committer %s %s %s\n" % (committer, int(date[0]), date[1]))
ui.write("revision %d\n" % ctx.rev())
ui.write("branch %s\n\n" % ctx.branch())
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if prefix != "":
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write("%s%s\n" % (prefix, description.replace('\n', nlprefix).strip()))
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 else:
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write(description + "\n")
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if prefix:
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write('\0')
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432
def base(ui, repo, node1, node2):
Martin Geisler
lowercase help output...
r7598 """output common ancestor information"""
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 node1 = repo.lookup(node1)
node2 = repo.lookup(node2)
n = repo.changelog.ancestor(node1, node2)
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 ui.write(short(n) + "\n")
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432
def catfile(ui, repo, type=None, r=None, **opts):
"""cat a specific revision"""
# in stdin mode, every line except the commit is prefixed with two
# spaces. This way the our caller can find the commit without magic
# strings
#
prefix = ""
if opts['stdin']:
try:
Benoit Boissinot
fix coding style (reported by pylint)
r10394 (type, r) = raw_input().split(' ')
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 prefix = " "
except EOFError:
return
else:
if not type or not r:
Martin Geisler
i18n: mark strings for translation in hgk extension
r6958 ui.warn(_("cat-file: type or revision not supplied\n"))
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 commands.help_(ui, 'cat-file')
while r:
if type != "commit":
Martin Geisler
i18n: mark strings for translation in hgk extension
r6958 ui.warn(_("aborting hg cat-file only understands commits\n"))
Benoit Boissinot
fix coding style (reported by pylint)
r10394 return 1
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 n = repo.lookup(r)
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 catcommit(ui, repo, n, prefix)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if opts['stdin']:
try:
Benoit Boissinot
fix coding style (reported by pylint)
r10394 (type, r) = raw_input().split(' ')
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 except EOFError:
break
else:
break
# git rev-tree is a confusing thing. You can supply a number of
# commit sha1s on the command line, and it walks the commit history
# telling you which commits are reachable from the supplied ones via
# a bitmask based on arg position.
# you can specify a commit to stop at by starting the sha1 with ^
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 def revtree(ui, args, repo, full="tree", maxnr=0, parents=False):
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 def chlogwalk():
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 count = len(repo)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 i = count
l = [0] * 100
chunk = 100
while True:
if chunk > i:
chunk = i
i = 0
else:
i -= chunk
Martin Geisler
replace xrange(0, n) with xrange(n)
r8624 for x in xrange(chunk):
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if i + x >= count:
l[chunk - x:] = [0] * (chunk - x)
break
Martin Geisler
code style: prefer 'is' and 'is not' tests with singletons
r13031 if full is not None:
Matt Mackall
use repo[changeid] to get a changectx
r6747 l[x] = repo[i + x]
Benoit Boissinot
hgk: (re)optimize reading of changelog and manifest
r3981 l[x].changeset() # force reading
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 else:
l[x] = 1
Matt Mackall
many, many trivial check-code fixups
r10282 for x in xrange(chunk - 1, -1, -1):
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if l[x] != 0:
Martin Geisler
code style: prefer 'is' and 'is not' tests with singletons
r13031 yield (i + x, full is not None and l[x] or None)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if i == 0:
break
# calculate and return the reachability bitmask for sha
def is_reachable(ar, reachable, sha):
if len(ar) == 0:
return 1
mask = 0
Benoit Boissinot
use xrange instead of range
r3473 for i in xrange(len(ar)):
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if sha in reachable[i]:
mask |= 1 << i
return mask
reachable = []
stop_sha1 = []
want_sha1 = []
count = 0
# figure out which commits they are asking for and which ones they
# want us to stop on
Martin Geisler
replace "i in range(len(xs))" with "i, x in enumerate(xs)"...
r8632 for i, arg in enumerate(args):
if arg.startswith('^'):
s = repo.lookup(arg[1:])
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 stop_sha1.append(s)
want_sha1.append(s)
Martin Geisler
replace "i in range(len(xs))" with "i, x in enumerate(xs)"...
r8632 elif arg != 'HEAD':
want_sha1.append(repo.lookup(arg))
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432
# calculate the graph for the supplied commits
Martin Geisler
replace "i in range(len(xs))" with "i, x in enumerate(xs)"...
r8632 for i, n in enumerate(want_sha1):
Benoit Boissinot
fix coding style (reported by pylint)
r10394 reachable.append(set())
visit = [n]
Benoit Boissinot
hgk: use set instead of dict
r8459 reachable[i].add(n)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 while visit:
n = visit.pop(0)
if n in stop_sha1:
continue
for p in repo.changelog.parents(n):
if p not in reachable[i]:
Benoit Boissinot
hgk: use set instead of dict
r8459 reachable[i].add(p)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 visit.append(p)
if p in stop_sha1:
continue
# walk the repository looking for commits that are in our
# reachability graph
Benoit Boissinot
hgk: use contexts
r3979 for i, ctx in chlogwalk():
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 n = repo.changelog.node(i)
mask = is_reachable(want_sha1, reachable, n)
if mask:
parentstr = ""
if parents:
pp = repo.changelog.parents(n)
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 if pp[0] != nullid:
parentstr += " " + short(pp[0])
if pp[1] != nullid:
parentstr += " " + short(pp[1])
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if not full:
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 ui.write("%s%s\n" % (short(n), parentstr))
Benoit Boissinot
hgk.py: fix warnings from pychecker...
r3064 elif full == "commit":
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 ui.write("%s%s\n" % (short(n), parentstr))
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 catcommit(ui, repo, n, ' ', ctx)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 else:
(p1, p2) = repo.changelog.parents(n)
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 (h, h1, h2) = map(short, (n, p1, p2))
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 (i1, i2) = map(repo.changelog.rev, (p1, p2))
Benoit Boissinot
hgk: use contexts
r3979 date = ctx.date()[0]
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write("%s %s:%s" % (date, h, mask))
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 mask = is_reachable(want_sha1, reachable, p1)
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 if i1 != nullrev and mask > 0:
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write("%s:%s " % (h1, mask)),
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 mask = is_reachable(want_sha1, reachable, p2)
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 if i2 != nullrev and mask > 0:
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 ui.write("%s:%s " % (h2, mask))
ui.write("\n")
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 if maxnr and count >= maxnr:
break
count += 1
Brendan Cully
hgk: add --limit, and revranges
r3093 def revparse(ui, repo, *revs, **opts):
Martin Geisler
lowercase help output...
r7598 """parse given revisions"""
Brendan Cully
hgk: add --limit, and revranges
r3093 def revstr(rev):
if rev == 'HEAD':
rev = 'tip'
return revlog.hex(repo.lookup(rev))
for r in revs:
revrange = r.split(':', 1)
ui.write('%s\n' % revstr(revrange[0]))
if len(revrange) == 2:
ui.write('^%s\n' % revstr(revrange[1]))
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 # git rev-list tries to order things by date, and has the ability to stop
# at a given commit without walking the whole repo. TODO add the stop
# parameter
def revlist(ui, repo, *revs, **opts):
"""print revisions"""
if opts['header']:
full = "commit"
else:
full = None
copy = [x for x in revs]
Matt Mackall
transform a bunch of print statements to appropriate ui calls
r5878 revtree(ui, copy, repo, full, opts['max_count'], opts['parents'])
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432
Patrick Mezard
hgk: add debug-config command to pass configuration options
r5393 def config(ui, repo, **opts):
"""print extension options"""
def writeopt(name, value):
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760 ui.write('k=%s\nv=%s\n' % (name, value))
Patrick Mezard
hgk: add debug-config command to pass configuration options
r5393
writeopt('vdiff', ui.config('hgk', 'vdiff', ''))
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760
Patrick Mezard
hgk: add debug-config command to pass configuration options
r5393
Brendan Cully
hgk: add --limit, and revranges
r3093 def view(ui, repo, *etc, **opts):
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 "start interactive history viewer"
os.chdir(repo.root)
TK Soh
hgk: fix mixup of --limit and REVRANGE in hgk call
r3180 optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
Martin Geisler
do not attempt to translate ui.debug output
r9467 ui.debug("running %s\n" % cmd)
Thomas Arendsen Hein
hgk: Use $HG instead of hg (see 849f011dbf79)
r4688 util.system(cmd)
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432
cmdtable = {
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "^view":
(view,
FUJIWARA Katsunori
help: show value requirement and multiple occurrence of options...
r11321 [('l', 'limit', '',
_('limit number of changes displayed'), _('NUM'))],
Martin Geisler
i18n, hgk: mark command line options for translation
r7000 _('hg view [-l LIMIT] [REVRANGE]')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "debug-diff-tree":
(difftree,
Martin Geisler
i18n, hgk: mark command line options for translation
r7000 [('p', 'patch', None, _('generate patch')),
('r', 'recursive', None, _('recursive')),
('P', 'pretty', None, _('pretty')),
('s', 'stdin', None, _('stdin')),
('C', 'copy', None, _('detect copies')),
('S', 'search', "", _('search'))],
_('hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]...')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "debug-cat-file":
(catfile,
Martin Geisler
i18n, hgk: mark command line options for translation
r7000 [('s', 'stdin', None, _('stdin'))],
_('hg debug-cat-file [OPTION]... TYPE FILE')),
Patrick Mezard
hgk: add debug-config command to pass configuration options
r5393 "debug-config":
Martin Geisler
i18n, hgk: mark command line options for translation
r7000 (config, [], _('hg debug-config')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "debug-merge-base":
Martin Geisler
hgk: standardize cmdline help strings
r8946 (base, [], _('hg debug-merge-base REV REV')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "debug-rev-parse":
(revparse,
Martin Geisler
i18n, hgk: mark command line options for translation
r7000 [('', 'default', '', _('ignored'))],
_('hg debug-rev-parse REV')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "debug-rev-list":
(revlist,
Martin Geisler
i18n, hgk: mark command line options for translation
r7000 [('H', 'header', None, _('header')),
('t', 'topo-order', None, _('topo-order')),
('p', 'parents', None, _('parents')),
('n', 'max-count', 0, _('max-count'))],
Martin Geisler
hgk: standardize cmdline help strings
r8946 _('hg debug-rev-list [OPTION]... REV...')),
Vadim Gelfer
move hgk.py into hgext. now to enable "hg view" is one less step....
r2432 }