remote-hg: add support for hg-git compat mode
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>maint
parent
6497a2bab5
commit
422ab5beb2
|
@ -16,6 +16,22 @@ import sys
|
||||||
import os
|
import os
|
||||||
import json
|
import json
|
||||||
import shutil
|
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('^([^<>]+)')
|
NAME_RE = re.compile('^([^<>]+)')
|
||||||
AUTHOR_RE = re.compile('^([^<>]+?)? ?<([^<>]+)>$')
|
AUTHOR_RE = re.compile('^([^<>]+?)? ?<([^<>]+)>$')
|
||||||
|
@ -226,7 +242,7 @@ def mark_to_rev(mark):
|
||||||
return marks.to_rev(mark)
|
return marks.to_rev(mark)
|
||||||
|
|
||||||
def export_ref(repo, name, kind, head):
|
def export_ref(repo, name, kind, head):
|
||||||
global prefix, marks
|
global prefix, marks, mode
|
||||||
|
|
||||||
ename = '%s/%s' % (kind, name)
|
ename = '%s/%s' % (kind, name)
|
||||||
tip = marks.get_tip(ename)
|
tip = marks.get_tip(ename)
|
||||||
|
@ -261,6 +277,33 @@ def export_ref(repo, name, kind, head):
|
||||||
else:
|
else:
|
||||||
modified, removed = get_filechanges(repo, c, parents[0])
|
modified, removed = get_filechanges(repo, c, parents[0])
|
||||||
|
|
||||||
|
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:
|
if len(parents) == 0 and rev:
|
||||||
print 'reset %s/%s' % (prefix, ename)
|
print 'reset %s/%s' % (prefix, ename)
|
||||||
|
|
||||||
|
@ -354,7 +397,7 @@ def list_head(repo, cur):
|
||||||
g_head = (head, node)
|
g_head = (head, node)
|
||||||
|
|
||||||
def do_list(parser):
|
def do_list(parser):
|
||||||
global branches, bmarks
|
global branches, bmarks, mode
|
||||||
|
|
||||||
repo = parser.repo
|
repo = parser.repo
|
||||||
for branch in repo.branchmap():
|
for branch in repo.branchmap():
|
||||||
|
@ -368,8 +411,11 @@ def do_list(parser):
|
||||||
cur = repo.dirstate.branch()
|
cur = repo.dirstate.branch()
|
||||||
|
|
||||||
list_head(repo, cur)
|
list_head(repo, cur)
|
||||||
|
|
||||||
|
if mode != 'hg':
|
||||||
for branch in branches:
|
for branch in branches:
|
||||||
print "? refs/heads/branches/%s" % branch
|
print "? refs/heads/branches/%s" % branch
|
||||||
|
|
||||||
for bmark in bmarks:
|
for bmark in bmarks:
|
||||||
print "? refs/heads/%s" % bmark
|
print "? refs/heads/%s" % bmark
|
||||||
|
|
||||||
|
@ -437,6 +483,7 @@ def get_merge_files(repo, p1, p2, files):
|
||||||
|
|
||||||
def parse_commit(parser):
|
def parse_commit(parser):
|
||||||
global marks, blob_marks, bmarks, parsed_refs
|
global marks, blob_marks, bmarks, parsed_refs
|
||||||
|
global mode
|
||||||
|
|
||||||
from_mark = merge_mark = None
|
from_mark = merge_mark = None
|
||||||
|
|
||||||
|
@ -482,7 +529,9 @@ def parse_commit(parser):
|
||||||
return of['ctx']
|
return of['ctx']
|
||||||
is_exec = of['mode'] == 'x'
|
is_exec = of['mode'] == 'x'
|
||||||
is_link = of['mode'] == 'l'
|
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
|
repo = parser.repo
|
||||||
|
|
||||||
|
@ -509,6 +558,21 @@ def parse_commit(parser):
|
||||||
if merge_mark:
|
if merge_mark:
|
||||||
get_merge_files(repo, p1, p2, files)
|
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,
|
ctx = context.memctx(repo, (p1, p2), data,
|
||||||
files.keys(), getfilectx,
|
files.keys(), getfilectx,
|
||||||
user, (date, tz), extra)
|
user, (date, tz), extra)
|
||||||
|
@ -596,12 +660,25 @@ def do_export(parser):
|
||||||
def main(args):
|
def main(args):
|
||||||
global prefix, dirname, branches, bmarks
|
global prefix, dirname, branches, bmarks
|
||||||
global marks, blob_marks, parsed_refs
|
global marks, blob_marks, parsed_refs
|
||||||
global peer
|
global peer, mode
|
||||||
|
|
||||||
alias = args[1]
|
alias = args[1]
|
||||||
url = args[2]
|
url = args[2]
|
||||||
peer = None
|
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:
|
if alias[4:] == url:
|
||||||
is_tmp = True
|
is_tmp = True
|
||||||
alias = util.sha1(alias).hexdigest()
|
alias = util.sha1(alias).hexdigest()
|
||||||
|
|
Loading…
Reference in New Issue