Mercurial > hg > mercurial-crew-with-dirclash
view hgext/hgk.py @ 3612:d1b16a746db6
Add allowed bundle types as argument to hgweb unbundle capability.
Arguments to capabilities were added before the 0.9.1 release, so there
are no compatibility issues. Mercurial 0.9 didn't support http push.
Using HG10GZ, HG10BZ and HG10UN has the advantage that new bundle types can
be added later and the client doesn't have to try sending them first and
reacting on errors sent by the server.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 02 Nov 2006 14:39:08 +0100 |
parents | 3b4e00cba57a |
children | 792e61e9a00a |
line wrap: on
line source
# Minimal support for git commands on an hg repository # # Copyright 2005, 2006 Chris Mason <mason@suse.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. from mercurial.demandload import * demandload(globals(), 'time sys signal os') 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""" def __difftree(repo, node1, node2, files=[]): if node2: change = repo.changelog.read(node2) mmap2 = repo.manifest.read(change[0]) status = repo.status(node1, node2, files=files)[:5] modified, added, removed, deleted, unknown = status else: status = repo.status(node1, files=files)[:5] modified, added, removed, deleted, unknown = status if not node1: node1 = repo.dirstate.parents()[0] change = repo.changelog.read(node1) mmap = repo.manifest.read(change[0]) empty = hg.short(hg.nullid) for f in modified: # TODO get file permissions print ":100664 100664 %s %s M\t%s\t%s" % (hg.short(mmap[f]), hg.short(mmap2[f]), f, f) for f in added: print ":000000 100664 %s %s N\t%s\t%s" % (empty, hg.short(mmap2[f]), f, f) for f in removed: print ":100664 000000 %s %s D\t%s\t%s" % (hg.short(mmap[f]), empty, f, f) ## 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']: catcommit(repo, node2, "") patch.diff(repo, node1, node2, files=files, opts=patch.diffopts(ui, {'git': True})) else: __difftree(repo, node1, node2, files=files) if not opts['stdin']: break def catcommit(repo, n, prefix, changes=None): nlprefix = '\n' + prefix; (p1, p2) = repo.changelog.parents(n) (h, h1, h2) = map(hg.short, (n, p1, p2)) (i1, i2) = map(repo.changelog.rev, (p1, p2)) if not changes: changes = repo.changelog.read(n) print "tree %s" % (hg.short(changes[0])) if i1 != hg.nullrev: print "parent %s" % (h1) if i2 != hg.nullrev: print "parent %s" % (h2) date_ar = changes[2] date = int(float(date_ar[0])) lines = changes[4].splitlines() if lines and lines[-1].startswith('committer:'): committer = lines[-1].split(': ')[1].rstrip() else: committer = changes[1] print "author %s %s %s" % (changes[1], date, date_ar[1]) print "committer %s %s %s" % (committer, date, date_ar[1]) print "revision %d" % repo.changelog.rev(n) print "" if prefix != "": print "%s%s" % (prefix, changes[4].replace('\n', nlprefix).strip()) else: print changes[4] if prefix: sys.stdout.write('\0') def base(ui, repo, node1, node2): """Output common ancestor information""" node1 = repo.lookup(node1) node2 = repo.lookup(node2) n = repo.changelog.ancestor(node1, node2) print hg.short(n) 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: (type, r) = raw_input().split(' '); prefix = " " except EOFError: return else: if not type or not r: ui.warn("cat-file: type or revision not supplied\n") commands.help_(ui, 'cat-file') while r: if type != "commit": sys.stderr.write("aborting hg cat-file only understands commits\n") sys.exit(1); n = repo.lookup(r) catcommit(repo, n, prefix) if opts['stdin']: try: (type, r) = raw_input().split(' '); 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 ^ def revtree(args, repo, full="tree", maxnr=0, parents=False): def chlogwalk(): ch = repo.changelog count = ch.count() i = count l = [0] * 100 chunk = 100 while True: if chunk > i: chunk = i i = 0 else: i -= chunk for x in xrange(0, chunk): if i + x >= count: l[chunk - x:] = [0] * (chunk - x) break if full != None: l[x] = ch.read(ch.node(i + x)) else: l[x] = 1 for x in xrange(chunk-1, -1, -1): if l[x] != 0: yield (i + x, full != None and l[x] or None) 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 for i in xrange(len(ar)): 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 for i in xrange(len(args)): if args[i].startswith('^'): s = repo.lookup(args[i][1:]) stop_sha1.append(s) want_sha1.append(s) elif args[i] != 'HEAD': want_sha1.append(repo.lookup(args[i])) # calculate the graph for the supplied commits for i in xrange(len(want_sha1)): reachable.append({}); n = want_sha1[i]; visit = [n]; reachable[i][n] = 1 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]: reachable[i][p] = 1 visit.append(p) if p in stop_sha1: continue # walk the repository looking for commits that are in our # reachability graph for i, changes in chlogwalk(): n = repo.changelog.node(i) mask = is_reachable(want_sha1, reachable, n) if mask: parentstr = "" if parents: pp = repo.changelog.parents(n) if pp[0] != hg.nullid: parentstr += " " + hg.short(pp[0]) if pp[1] != hg.nullid: parentstr += " " + hg.short(pp[1]) if not full: print hg.short(n) + parentstr elif full == "commit": print hg.short(n) + parentstr catcommit(repo, n, ' ', changes) else: (p1, p2) = repo.changelog.parents(n) (h, h1, h2) = map(hg.short, (n, p1, p2)) (i1, i2) = map(repo.changelog.rev, (p1, p2)) date = changes[2][0] print "%s %s:%s" % (date, h, mask), mask = is_reachable(want_sha1, reachable, p1) if i1 != hg.nullrev and mask > 0: print "%s:%s " % (h1, mask), mask = is_reachable(want_sha1, reachable, p2) if i2 != hg.nullrev and mask > 0: print "%s:%s " % (h2, mask), print "" if maxnr and count >= maxnr: 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 def revlist(ui, repo, *revs, **opts): """print revisions""" if opts['header']: full = "commit" else: full = None copy = [x for x in revs] revtree(copy, repo, full, opts['max_count'], opts['parents']) def view(ui, repo, *etc, **opts): "start interactive history viewer" os.chdir(repo.root) 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)) ui.debug("running %s\n" % cmd) os.system(cmd) cmdtable = { "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'), ('s', 'stdin', None, 'stdin'), ('C', 'copy', None, 'detect copies'), ('S', 'search', "", 'search')], "hg git-diff-tree [options] node1 node2 [files...]"), "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'), ('n', 'max-count', 0, 'max-count')], "hg debug-rev-list [options] revs"), }