From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: [PATCH v4 08/13] remote-hg: add support for hg-git compat mode Date: Sun, 28 Oct 2012 04:54:08 +0100 Message-ID: <1351396453-29042-9-git-send-email-felipe.contreras@gmail.com> References: <1351396453-29042-1-git-send-email-felipe.contreras@gmail.com> Cc: Junio C Hamano , Sverre Rabbelier , Johannes Schindelin , Ilari Liusvaara , Daniel Barkalow , Jeff King , Michael J Gruber , Felipe Contreras To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Oct 28 04:55:43 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TSJyM-0003Uz-V5 for gcvg-git-2@plane.gmane.org; Sun, 28 Oct 2012 04:55:39 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754911Ab2J1DzX (ORCPT ); Sat, 27 Oct 2012 23:55:23 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:38829 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531Ab2J1DzU (ORCPT ); Sat, 27 Oct 2012 23:55:20 -0400 Received: by mail-ee0-f46.google.com with SMTP id b15so1585004eek.19 for ; Sat, 27 Oct 2012 20:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=tI8faRUnJITn64HtgPfbrCug5CqB4vjrRcSVLwWM/zM=; b=v6zMja9BS8Y9GTT5suyZDGnvyy8qEavlz/HFgJc5AA02XJ6XZyhR8yLKZAd0f4Gn5f DAKynNwfqbw4RCtynslS1gnP21oaJneAXU1Q10ZFYEDA3DAq+SUVA0cQh5L273wFyXPV 2tfppfjWAgPuNyghvpkGp2M/oEt6HGaTm2/nII3/sJEQyszbRY0vTmAyg7BqFPKNFcX+ PLsNYK1Tl1AQB5C+PtA6ONOZq3+gjCboFfnI5Z9nOsImpKS/yyIqXJGS0TgNU2rXUWDz 1OZJe63tBDIvDMG6GnwhFoSnPisHTbz4900nRg+kCQFgblhi/d1hgiM0shz+CR7V2i6Q 2JaA== Received: by 10.14.175.71 with SMTP id y47mr47940125eel.36.1351396519532; Sat, 27 Oct 2012 20:55:19 -0700 (PDT) Received: from localhost (ip-109-43-0-40.web.vodafone.de. [109.43.0.40]) by mx.google.com with ESMTPS id g5sm13233847eem.4.2012.10.27.20.55.16 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 27 Oct 2012 20:55:18 -0700 (PDT) X-Mailer: git-send-email 1.8.0 In-Reply-To: <1351396453-29042-1-git-send-email-felipe.contreras@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Felipe Contreras --- contrib/remote-hg/git-remote-hg | 102 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 95 insertions(+), 7 deletions(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index 57e54c2..47bb7c1 100755 --- a/contrib/remote-hg/git-remote-hg +++ b/contrib/remote-hg/git-remote-hg @@ -13,6 +13,22 @@ import sys import os import json import shutil +import subprocess + +# +# If you want to switch to hg-git compatibility mode: +# git config --global remote-hg.hg-git-compat true +# +# git: +# Sensible defaults for git. +# hg bookmarks are exported as git branches, hg branches are prefixed +# with 'branches/'. +# +# hg: +# Emulate hg-git. +# Only hg bookmarks are exported as git branches. +# Commits are modified to preserve hg information and allow biridectionality. +# NAME_RE = re.compile('^([^<>]+)') AUTHOR_RE = re.compile('^([^<>]+?)? ?<([^<>]+)>$') @@ -209,7 +225,7 @@ def mark_to_rev(mark): return marks.to_rev(mark) def export_ref(repo, name, kind, head): - global prefix, marks + global prefix, marks, mode ename = '%s/%s' % (kind, name) tip = marks.get_tip(ename) @@ -244,6 +260,33 @@ def export_ref(repo, name, kind, head): else: modified, removed = get_filechanges(repo, c, parents) + if mode == 'hg': + extra_msg = '' + + if rev_branch != 'default': + extra_msg += 'branch : %s\n' % rev_branch + + renames = [] + for f in c.files(): + if f not in c.manifest(): + continue + rename = c.filectx(f).renamed() + if rename: + renames.append((rename[0], f)) + + for e in renames: + extra_msg += "rename : %s => %s\n" % e + + for key, value in extra.iteritems(): + if key in ('author', 'committer', 'encoding', 'message', 'branch', 'hg-git'): + continue + else: + extra_msg += "extra : %s : %s\n" % (key, urllib.quote(value)) + + desc += '\n' + if extra_msg: + desc += '\n--HG--\n' + extra_msg + if len(parents) == 0 and rev: print 'reset %s/%s' % (prefix, ename) @@ -332,8 +375,18 @@ def list_branch_head(repo, cur): print "@refs/heads/%s HEAD" % head g_head = (head, 'branches', repo[tip]) +def list_bookmark_head(repo, cur): + global g_head + + head = bookmarks.readcurrent(repo) + if not head: + return + node = repo[head] + print "@refs/heads/%s HEAD" % head + g_head = (head, 'bookmarks', node) + def do_list(parser): - global branches, bmarks + global branches, bmarks, mode repo = parser.repo for branch in repo.branchmap(): @@ -346,9 +399,13 @@ def do_list(parser): cur = repo.dirstate.branch() - list_branch_head(repo, cur) - for branch in branches: - print "? refs/heads/branches/%s" % branch + if mode != 'hg': + list_branch_head(repo, cur) + for branch in branches: + print "? refs/heads/branches/%s" % branch + else: + list_bookmark_head(repo, cur) + for bmark in bmarks: print "? refs/heads/%s" % bmark @@ -414,6 +471,7 @@ def get_merge_files(repo, p1, p2, files): def parse_commit(parser): global marks, blob_marks, bmarks, parsed_refs + global mode from_mark = merge_mark = None @@ -460,7 +518,9 @@ def parse_commit(parser): return of['ctx'] is_exec = of['mode'] == 'x' is_link = of['mode'] == 'l' - return context.memfilectx(f, of['data'], is_link, is_exec, None) + rename = of.get('rename', None) + return context.memfilectx(f, of['data'], + is_link, is_exec, rename) repo = parser.repo @@ -487,6 +547,21 @@ def parse_commit(parser): if merge_mark: get_merge_files(repo, p1, p2, files) + if mode == 'hg': + i = data.find('\n--HG--\n') + if i >= 0: + tmp = data[i + len('\n--HG--\n'):].strip() + for k, v in [e.split(' : ') for e in tmp.split('\n')]: + if k == 'rename': + old, new = v.split(' => ', 1) + files[new]['rename'] = old + elif k == 'branch': + extra[k] = v + elif k == 'extra': + ek, ev = v.split(' : ', 1) + extra[ek] = urllib.unquote(ev) + data = data[:i] + ctx = context.memctx(repo, (p1, p2), data, files.keys(), getfilectx, user, (date, tz), extra) @@ -571,12 +646,25 @@ def do_export(parser): def main(args): global prefix, dirname, branches, bmarks global marks, blob_marks, parsed_refs - global peer + global peer, mode alias = args[1] url = args[2] peer = None + cmd = ['git', 'config', '--get', 'remote-hg.hg-git-compat'] + hg_git_compat = False + try: + if subprocess.check_output(cmd) == 'true\n': + hg_git_compat = True + except subprocess.CalledProcessError: + pass + + if hg_git_compat: + mode = 'hg' + else: + mode = 'git' + if alias[4:] == url: is_tmp = True alias = util.sha1(alias).hexdigest() -- 1.8.0