Nemcio/git-remote-hg
1
0
Fork 0
mirror of https://github.com/mnauw/git-remote-hg.git synced 2025-11-04 02:25:48 +01:00
Code Issues Packages Projects Releases Activity

Add compatibility for Mercurial v3.2

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras
2016-05-16 18:46:00 -05:00
parent 02a0a59a4b
commit 1e279075dc
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git-remote-hg
View File

@@ -430,6 +430,11 @@ def get_repo(url, alias):
peer = hg.peer(repo.ui, {}, url) peer = hg.peer(repo.ui, {}, url)
except: except:
die('Repository error') die('Repository error')
if check_version(3, 0):
from mercurial import exchange
exchange.pull(repo, peer, heads=None, force=True)
else:
repo.pull(peer, heads=None, force=True) repo.pull(peer, heads=None, force=True)
updatebookmarks(repo, peer) updatebookmarks(repo, peer)
@@ -803,6 +808,9 @@ def parse_commit(parser):
def getfilectx(repo, memctx, f): def getfilectx(repo, memctx, f):
of = files[f] of = files[f]
if 'deleted' in of: if 'deleted' in of:
if check_version(3, 2):
return None
else:
raise IOError raise IOError
if 'ctx' in of: if 'ctx' in of:
return of['ctx'] return of['ctx']
@@ -1036,7 +1044,9 @@ def push_unsafe(repo, remote, parsed_refs, p_revs):
if not checkheads(repo, remote, p_revs): if not checkheads(repo, remote, p_revs):
return None return None
if check_version(3, 0): if check_version(3, 2):
cg = changegroup.getchangegroup(repo, 'push', heads=list(p_revs), common=common)
elif check_version(3, 0):
cg = changegroup.getbundle(repo, 'push', heads=list(p_revs), common=common) cg = changegroup.getbundle(repo, 'push', heads=list(p_revs), common=common)
else: else:
cg = repo.getbundle('push', heads=list(p_revs), common=common) cg = repo.getbundle('push', heads=list(p_revs), common=common)