hgit
335 lines
| 11.1 KiB
| text/plain
|
TextLexer
/ contrib / hgit
mpm@selenic.com
|
r267 | #!/usr/bin/env python | ||
# | ||||
# Minimal support for git commands on an hg repository | ||||
# | ||||
# Copyright 2005 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. | ||||
import time, sys, signal | ||||
mason@suse.com
|
r1239 | from mercurial import hg, mdiff, fancyopts, commands, ui, util | ||
def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always, | ||||
changes=None, text=False): | ||||
def date(c): | ||||
return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) | ||||
if not changes: | ||||
(c, a, d, u) = repo.changes(node1, node2, files, match=match) | ||||
else: | ||||
(c, a, d, u) = changes | ||||
if files: | ||||
c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) | ||||
if not c and not a and not d: | ||||
return | ||||
if node2: | ||||
change = repo.changelog.read(node2) | ||||
mmap2 = repo.manifest.read(change[0]) | ||||
date2 = date(change) | ||||
def read(f): | ||||
return repo.file(f).read(mmap2[f]) | ||||
else: | ||||
date2 = time.asctime() | ||||
if not node1: | ||||
node1 = repo.dirstate.parents()[0] | ||||
def read(f): | ||||
return repo.wfile(f).read() | ||||
change = repo.changelog.read(node1) | ||||
mmap = repo.manifest.read(change[0]) | ||||
date1 = date(change) | ||||
for f in c: | ||||
to = None | ||||
if f in mmap: | ||||
to = repo.file(f).read(mmap[f]) | ||||
tn = read(f) | ||||
fp.write("diff --git a/%s b/%s\n" % (f, f)) | ||||
fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, text=text)) | ||||
for f in a: | ||||
to = None | ||||
tn = read(f) | ||||
fp.write("diff --git /dev/null b/%s\n" % (f)) | ||||
fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, text=text)) | ||||
for f in d: | ||||
to = repo.file(f).read(mmap[f]) | ||||
tn = None | ||||
fp.write("diff --git a/%s /dev/null\n" % (f)) | ||||
fp.write(mdiff.unidiff(to, date1, tn, date2, f, None, text=text)) | ||||
def difftree(ui, repo, node1=None, node2=None, **opts): | ||||
"""diff trees from two commits""" | ||||
def __difftree(repo, node1, node2): | ||||
mpm@selenic.com
|
r334 | def date(c): | ||
return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) | ||||
mpm@selenic.com
|
r267 | |||
mpm@selenic.com
|
r334 | if node2: | ||
change = repo.changelog.read(node2) | ||||
mmap2 = repo.manifest.read(change[0]) | ||||
mason@suse.com
|
r719 | (c, a, d, u) = repo.changes(node1, node2) | ||
mpm@selenic.com
|
r334 | def read(f): return repo.file(f).read(mmap2[f]) | ||
date2 = date(change) | ||||
else: | ||||
date2 = time.asctime() | ||||
mason@suse.com
|
r1239 | (c, a, d, u) = repo.changes(node1, None) | ||
mpm@selenic.com
|
r334 | if not node1: | ||
node1 = repo.dirstate.parents()[0] | ||||
def read(f): return file(os.path.join(repo.root, f)).read() | ||||
mpm@selenic.com
|
r267 | |||
mpm@selenic.com
|
r334 | change = repo.changelog.read(node1) | ||
mmap = repo.manifest.read(change[0]) | ||||
date1 = date(change) | ||||
empty = "0" * 40; | ||||
mpm@selenic.com
|
r267 | |||
mpm@selenic.com
|
r334 | for f in c: | ||
# TODO get file permissions | ||||
mpm@selenic.com
|
r406 | print ":100664 100664 %s %s M\t%s\t%s" % (hg.hex(mmap[f]), | ||
mpm@selenic.com
|
r334 | hg.hex(mmap2[f]), f, f) | ||
for f in a: | ||||
mpm@selenic.com
|
r406 | print ":000000 100664 %s %s N\t%s\t%s" % (empty, hg.hex(mmap2[f]), f, f) | ||
mpm@selenic.com
|
r334 | for f in d: | ||
mpm@selenic.com
|
r406 | print ":100664 000000 %s %s D\t%s\t%s" % (hg.hex(mmap[f]), empty, f, f) | ||
mpm@selenic.com
|
r267 | ## | ||
mason@suse.com
|
r1239 | 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, "") | ||||
dodiff(sys.stdout, ui, repo, node1, node2) | ||||
else: | ||||
__difftree(repo, node1, node2) | ||||
if not opts['stdin']: | ||||
break | ||||
mpm@selenic.com
|
r267 | |||
mason@suse.com
|
r1239 | def catcommit(repo, n, prefix, changes=None): | ||
mpm@selenic.com
|
r267 | nlprefix = '\n' + prefix; | ||
(p1, p2) = repo.changelog.parents(n) | ||||
(h, h1, h2) = map(hg.hex, (n, p1, p2)) | ||||
(i1, i2) = map(repo.changelog.rev, (p1, p2)) | ||||
mason@suse.com
|
r1239 | if not changes: | ||
changes = repo.changelog.read(n) | ||||
print "tree %s" % (hg.hex(changes[0])) | ||||
if i1 != -1: print "parent %s" % (h1) | ||||
if i2 != -1: print "parent %s" % (h2) | ||||
mpm@selenic.com
|
r267 | date_ar = changes[2].split(' ') | ||
date = int(float(date_ar[0])) | ||||
mason@suse.com
|
r1239 | lines = changes[4].splitlines() | ||
if lines[-1].startswith('committer:'): | ||||
committer = lines[-1].split(': ')[1].rstrip() | ||||
else: | ||||
committer = "%s %s %s" % (changes[1], date, date_ar[1]) | ||||
print "author %s %s %s" % (changes[1], date, date_ar[1]) | ||||
print "committer %s" % (committer) | ||||
print "" | ||||
mpm@selenic.com
|
r267 | if prefix != "": | ||
mpm@selenic.com
|
r334 | print "%s%s" % (prefix, changes[4].replace('\n', nlprefix).strip()) | ||
mpm@selenic.com
|
r267 | else: | ||
mpm@selenic.com
|
r334 | print changes[4] | ||
mason@suse.com
|
r1239 | if prefix: | ||
sys.stdout.write('\0') | ||||
mpm@selenic.com
|
r267 | |||
mason@suse.com
|
r1239 | 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.hex(n) | ||||
mpm@selenic.com
|
r267 | |||
mason@suse.com
|
r1239 | def catfile(ui, repo, type=None, r=None, **opts): | ||
"""cat a specific revision""" | ||||
mpm@selenic.com
|
r267 | # 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 = "" | ||||
mason@suse.com
|
r1239 | if opts['stdin']: | ||
mpm@selenic.com
|
r334 | try: | ||
(type, r) = raw_input().split(' '); | ||||
mason@suse.com
|
r1239 | prefix = " " | ||
mpm@selenic.com
|
r334 | except EOFError: | ||
return | ||||
mpm@selenic.com
|
r267 | |||
else: | ||||
mason@suse.com
|
r1239 | if not type or not r: | ||
ui.warn("cat-file: type or revision not supplied\n") | ||||
commands.help_(ui, 'cat-file') | ||||
mpm@selenic.com
|
r267 | |||
while r: | ||||
mpm@selenic.com
|
r334 | if type != "commit": | ||
sys.stderr.write("aborting hg cat-file only understands commits\n") | ||||
sys.exit(1); | ||||
mason@suse.com
|
r720 | n = repo.lookup(r) | ||
mpm@selenic.com
|
r334 | catcommit(repo, n, prefix) | ||
mason@suse.com
|
r1239 | if opts['stdin']: | ||
mpm@selenic.com
|
r334 | try: | ||
(type, r) = raw_input().split(' '); | ||||
except EOFError: | ||||
break | ||||
else: | ||||
break | ||||
mpm@selenic.com
|
r267 | |||
# 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 ^ | ||||
mason@suse.com
|
r1239 | 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 | ||||
mpm@selenic.com
|
r267 | # calculate and return the reachability bitmask for sha | ||
def is_reachable(ar, reachable, sha): | ||||
mpm@selenic.com
|
r334 | if len(ar) == 0: | ||
return 1 | ||||
mask = 0 | ||||
for i in range(len(ar)): | ||||
if sha in reachable[i]: | ||||
mask |= 1 << i | ||||
mpm@selenic.com
|
r267 | |||
mpm@selenic.com
|
r334 | return mask | ||
mpm@selenic.com
|
r267 | |||
reachable = [] | ||||
stop_sha1 = [] | ||||
want_sha1 = [] | ||||
mpm@selenic.com
|
r356 | count = 0 | ||
mpm@selenic.com
|
r267 | |||
# figure out which commits they are asking for and which ones they | ||||
# want us to stop on | ||||
for i in range(len(args)): | ||||
mason@suse.com
|
r720 | if args[i].startswith('^'): | ||
s = repo.lookup(args[i][1:]) | ||||
stop_sha1.append(s) | ||||
mpm@selenic.com
|
r334 | want_sha1.append(s) | ||
elif args[i] != 'HEAD': | ||||
mason@suse.com
|
r720 | want_sha1.append(repo.lookup(args[i])) | ||
mpm@selenic.com
|
r356 | |||
mpm@selenic.com
|
r267 | # calculate the graph for the supplied commits | ||
for i in range(len(want_sha1)): | ||||
mpm@selenic.com
|
r334 | reachable.append({}); | ||
mason@suse.com
|
r720 | n = want_sha1[i]; | ||
mpm@selenic.com
|
r334 | visit = [n]; | ||
reachable[i][n] = 1 | ||||
while visit: | ||||
n = visit.pop(0) | ||||
if n in stop_sha1: | ||||
root@coffee.suse.com
|
r1243 | continue | ||
mpm@selenic.com
|
r334 | 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: | ||||
root@coffee.suse.com
|
r1243 | continue | ||
mpm@selenic.com
|
r356 | |||
mpm@selenic.com
|
r267 | # walk the repository looking for commits that are in our | ||
# reachability graph | ||||
mason@suse.com
|
r1239 | #for i in range(repo.changelog.count()-1, -1, -1): | ||
for i, changes in chlogwalk(): | ||||
mpm@selenic.com
|
r334 | n = repo.changelog.node(i) | ||
mask = is_reachable(want_sha1, reachable, n) | ||||
if mask: | ||||
mason@suse.com
|
r1239 | parentstr = "" | ||
if parents: | ||||
pp = repo.changelog.parents(n) | ||||
if pp[0] != hg.nullid: | ||||
parentstr += " " + hg.hex(pp[0]) | ||||
if pp[1] != hg.nullid: | ||||
parentstr += " " + hg.hex(pp[1]) | ||||
mpm@selenic.com
|
r356 | if not full: | ||
mason@suse.com
|
r1239 | print hg.hex(n) + parentstr | ||
mpm@selenic.com
|
r356 | elif full is "commit": | ||
mason@suse.com
|
r1239 | print hg.hex(n) + parentstr | ||
catcommit(repo, n, ' ', changes) | ||||
mpm@selenic.com
|
r356 | else: | ||
(p1, p2) = repo.changelog.parents(n) | ||||
(h, h1, h2) = map(hg.hex, (n, p1, p2)) | ||||
(i1, i2) = map(repo.changelog.rev, (p1, p2)) | ||||
mpm@selenic.com
|
r267 | |||
mpm@selenic.com
|
r356 | date = changes[2].split(' ')[0] | ||
print "%s %s:%s" % (date, h, mask), | ||||
mask = is_reachable(want_sha1, reachable, p1) | ||||
if i1 != -1 and mask > 0: | ||||
print "%s:%s " % (h1, mask), | ||||
mask = is_reachable(want_sha1, reachable, p2) | ||||
if i2 != -1 and mask > 0: | ||||
print "%s:%s " % (h2, mask), | ||||
print "" | ||||
if maxnr and count >= maxnr: | ||||
break | ||||
count += 1 | ||||
mpm@selenic.com
|
r267 | |||
# 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 | ||||
mason@suse.com
|
r1239 | def revlist(ui, repo, *revs, **opts): | ||
"""print revisions""" | ||||
if opts['header']: | ||||
mpm@selenic.com
|
r356 | full = "commit" | ||
else: | ||||
full = None | ||||
mason@suse.com
|
r1239 | copy = [x for x in revs] | ||
revtree(copy, repo, full, opts['max_count'], opts['parents']) | ||||
mpm@selenic.com
|
r267 | |||
mason@suse.com
|
r1239 | cmdtable = { | ||
"git-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"), | ||||
"git-cat-file": (catfile, [('s', 'stdin', None, 'stdin')], | ||||
"hg cat-file [options] type file"), | ||||
"git-merge-base": (base, [], "hg git-merge-base node node"), | ||||
"git-rev-list": (revlist, [('H', 'header', None, 'header'), | ||||
('t', 'topo-order', None, 'topo-order'), | ||||
('p', 'parents', None, 'parents'), | ||||
('n', 'max-count', 0, 'max-count')], | ||||
"hg git-rev-list [options] revs"), | ||||
} | ||||
mpm@selenic.com
|
r267 | |||
mason@suse.com
|
r1239 | def reposetup(ui, repo): | ||
pass | ||||