Signed-off-by: Felipe Contreras <felipe.contre...@gmail.com> --- I've looked at many hg<->git tools and none satisfy me. Too complicated, or too slow, or to difficult to setup, etc.
The only one I've liked so far is hg-fast-export[1], which is indeed fast, relatively simple, and relatively easy to use. But it's not properly maintained any more. So, I decided to write my own from scratch, using hg-fast-export as inspiration, and voila. This one doesn't have any dependencies, just put it into your $PATH, and you can clone and fetch hg repositories. More importantly to me; the code is simple, and easy to maintain. [1] http://repo.or.cz/w/fast-export.git contrib/remote-hd/git-remote-hg | 231 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) create mode 100755 contrib/remote-hd/git-remote-hg diff --git a/contrib/remote-hd/git-remote-hg b/contrib/remote-hd/git-remote-hg new file mode 100755 index 0000000..9157b30 --- /dev/null +++ b/contrib/remote-hd/git-remote-hg @@ -0,0 +1,231 @@ +#!/usr/bin/python2 + +# Inspired by Rocco Rutte's hg-fast-export + +# Just copy to your ~/bin, or anywhere in your $PATH. +# Then you can clone with: +# hg::file:///path/to/mercurial/repo/ + +from mercurial import hg, ui + +import re +import sys +import os +import json + +def die(msg, *args): + print >> sys.stderr, 'ERROR:', msg % args + sys.exit(1) + +def gitmode(flags): + return 'l' in flags and '120000' or 'x' in flags and '100755' or '100644' + +def export_file(fc): + if fc.path() == '.hgtags': + return + d = fc.data() + print "M %s inline %s" % (gitmode(fc.flags()), fc.path()) + print "data %d" % len(d) + print d + +def get_filechanges(repo, ctx, parents): + l = [repo.status(p, ctx)[:3] for p in parents] + changed, added, removed = [sum(e, []) for e in zip(*l)] + return added + changed, removed + +author_re = re.compile('^((.+?) )?(<.+?>)$') + +def fixup_user(user): + user = user.replace('"', '') + m = author_re.match(user) + if m: + name = m.group(1) + mail = m.group(3) + else: + name = user + mail = None + + if not name: + name = 'Unknown' + if not mail: + mail = '<unknown>' + + return '%s %s' % (name, mail) + +def get_repo(path, alias): + myui = ui.ui() + myui.setconfig('ui', 'interactive', 'off') + repo = hg.repository(myui, path) + return repo + +def hg_branch(b): + if b == 'master': + return 'default' + return b + +def git_branch(b): + if b == 'default': + return 'master' + return b + +def export_tag(repo, tag): + global prefix + print "reset %s/tags/%s" % (prefix, tag) + print "from :%s" % (repo[tag].rev() + 1) + print + +def export_branch(repo, branch): + global prefix, marks, cache, branches + + heads = branches[hg_branch(branch)] + + # verify there's only one head + if (len(heads) > 1): + die("Branch '%s' has more than one head" % hg_branch(branch)) + + head = repo[heads[0]] + tip = marks.get(branch, 0) + # mercurial takes too much time checking this + if tip == head.rev(): + # nothing to do + return + revs = repo.revs('%u:%u' % (tip, head)) + count = 0 + + revs = [rev for rev in revs if not cache.get(rev, False)] + + for rev in revs: + + c = repo[rev] + (manifest, user, (time, tz), files, desc, extra) = repo.changelog.read(c.node()) + rev_branch = git_branch(extra['branch']) + + tz = '%+03d%02d' % (-tz / 3600, -tz % 3600 / 60) + + print "commit %s/branches/%s" % (prefix, rev_branch) + print "mark :%d" % (rev + 1) + print "committer %s %d %s" % (fixup_user(user), time, tz) + print "data %d" % (len(desc) + 1) + print desc + print + + parents = [p for p in repo.changelog.parentrevs(rev) if p >= 0] + + if len(parents) == 0: + modified = c.manifest().keys() + removed = [] + else: + added = [] + changed = [] + print "from :%s" % (parents[0] + 1) + if len(parents) > 1: + print "merge :%s" % (parents[1] + 1) + modified, removed = get_filechanges(repo, c, parents) + + for f in removed: + print "D %s" % (f) + for f in modified: + export_file(c.filectx(f)) + print + + count += 1 + if (count % 100 == 0): + print "progress revision %d '%s' (%d/%d)" % (rev, branch, count, len(revs)) + print "#############################################################" + + cache[rev] = True + + # store the latest revision + marks[branch] = rev + +def do_capabilities(repo, args): + global prefix, dirname + + print "import" + print "refspec refs/heads/*:%s/branches/*" % prefix + print "refspec refs/tags/*:%s/tags/*" % prefix + + path = os.path.join(dirname, 'marks-git') + + print "*export-marks %s" % path + if os.path.exists(path): + print "*import-marks %s" % path + + print + +def do_list(repo, args): + global branches + + head = repo.dirstate.branch() + for branch in repo.branchmap(): + heads = repo.branchheads(branch) + if len(heads): + branches[branch] = heads + + for branch in branches: + print "? refs/heads/%s" % git_branch(branch) + for tag, node in repo.tagslist(): + if tag == 'tip': + continue + print "? refs/tags/%s" % tag + print "@refs/heads/%s HEAD" % git_branch(head) + print + +def do_import(repo, args): + ref = args[1] + + if (ref == 'HEAD'): + return + + if ref.startswith('refs/heads/'): + branch = ref[len('refs/heads/'):] + export_branch(repo, branch) + elif ref.startswith('refs/tags/'): + tag = ref[len('refs/tags/'):] + export_tag(repo, tag) + +def main(args): + global prefix, dirname, marks, cache, branches + + alias = args[1] + url = args[2] + + gitdir = os.environ['GIT_DIR'] + dirname = os.path.join(gitdir, 'hg') + cache = {} + branches = {} + + repo = get_repo(url, alias) + prefix = 'refs/hg/%s' % alias + + if not os.path.exists(dirname): + os.makedirs(dirname) + + marks_path = os.path.join(dirname, 'marks-hg') + try: + fp = open(marks_path, 'r') + marks = json.load(fp) + fp.close() + except IOError: + marks = {} + + line = True + while (line): + line = sys.stdin.readline().strip() + if line == '': + break + args = line.split() + cmd = args[0] + if cmd == 'capabilities': + do_capabilities(repo, args) + elif cmd == 'list': + do_list(repo, args) + elif cmd == 'import': + do_import(repo, args) + sys.stdout.flush() + + fp = open(marks_path, 'w') + json.dump(marks, fp) + fp.close() + +sys.exit(main(sys.argv)) -- 1.8.0.rc2.5.gccf4c94 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
