# HG changeset patch # User Brendan Cully # Date 1158197098 25200 # Node ID edefbb3a3b0816dc02f8467b833885784e9f5eb7 # Parent d0fcce3728d1ef7287397d401a87496fdec9abb2 hgk: add --limit, and revranges diff --git a/contrib/hgk b/contrib/hgk --- a/contrib/hgk +++ b/contrib/hgk @@ -30,15 +30,29 @@ proc getcommits {rargs} { set startmsecs [clock clicks -milliseconds] set nextupdate [expr $startmsecs + 100] set ncmupdate 1 + set limit 0 + set revargs {} + for {set i 0} {$i < [llength $rargs]} {incr i} { + set opt [lindex $rargs $i] + if {$opt == "--limit"} { + incr i + set limit [lindex $rargs $i] + } else { + lappend revargs $opt + } + } if [catch { - set parse_args [concat --default HEAD $rargs] + set parse_args [concat --default HEAD $revargs] set parsed_args [split [eval exec hg debug-rev-parse $parse_args] "\n"] - }] { + } err] { # if git-rev-parse failed for some reason... if {$rargs == {}} { - set rargs HEAD + set revargs HEAD } - set parsed_args $rargs + set parsed_args $revargs + } + if {$limit > 0} { + set parsed_args [concat -n $limit $parsed_args] } if [catch { set commfd [open "|hg debug-rev-list --header --topo-order --parents $parsed_args" r] diff --git a/hgext/hgk.py b/hgext/hgk.py --- a/hgext/hgk.py +++ b/hgext/hgk.py @@ -7,7 +7,7 @@ from mercurial.demandload import * demandload(globals(), 'time sys signal os') -demandload(globals(), 'mercurial:hg,fancyopts,commands,ui,util,patch') +demandload(globals(), 'mercurial:hg,fancyopts,commands,ui,util,patch,revlog') def difftree(ui, repo, node1=None, node2=None, *files, **opts): """diff trees from two commits""" @@ -217,7 +217,6 @@ def revtree(args, repo, full="tree", max # walk the repository looking for commits that are in our # reachability graph - #for i in range(repo.changelog.count()-1, -1, -1): for i, changes in chlogwalk(): n = repo.changelog.node(i) mask = is_reachable(want_sha1, reachable, n) @@ -252,6 +251,19 @@ def revtree(args, repo, full="tree", max break count += 1 +def revparse(ui, repo, *revs, **opts): + """Parse given revisions""" + 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])) + # 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 @@ -264,13 +276,16 @@ def revlist(ui, repo, *revs, **opts): copy = [x for x in revs] revtree(copy, repo, full, opts['max_count'], opts['parents']) -def view(ui, repo, *etc): +def view(ui, repo, *etc, **opts): "start interactive history viewer" os.chdir(repo.root) - os.system(ui.config("hgk", "path", "hgk") + " " + " ".join(etc)) + optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems()]) + os.system(ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))) cmdtable = { - "view": (view, [], 'hg view'), + "view": (view, + [('l', 'limit', '', 'limit number of changes displayed')], + 'hg view [-l LIMIT] [REVRANGE]'), "debug-diff-tree": (difftree, [('p', 'patch', None, 'generate patch'), ('r', 'recursive', None, 'recursive'), ('P', 'pretty', None, 'pretty'), @@ -281,6 +296,9 @@ cmdtable = { "debug-cat-file": (catfile, [('s', 'stdin', None, 'stdin')], "hg debug-cat-file [options] type file"), "debug-merge-base": (base, [], "hg debug-merge-base node node"), + 'debug-rev-parse': (revparse, + [('', 'default', '', 'ignored')], + "hg debug-rev-parse rev"), "debug-rev-list": (revlist, [('H', 'header', None, 'header'), ('t', 'topo-order', None, 'topo-order'), ('p', 'parents', None, 'parents'),