mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-22 13:39:05 +02:00
Code

remote-hg: fix bad state issue

Browse Source 
The problem reportedly happened after doing a push that fails, the abort
causes the state of remote-hg to go bad, this happens because
remote-hg's marks are not stored, but 'git fast-export' marks are.

Ensure that the marks are _always_ stored.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-04-11 07:23:14 -05:00 committed by Junio C Hamano
parent 2e8e813232
commit 2594a79ea9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/remote-helpers/git-remote-hg
View File

@ -18,6 +18,7 @@ import json
import shutil
import subprocess
import urllib
import atexit
#
# If you want to switch to hg-git compatibility mode:
@ -791,7 +792,7 @@ def main(args):
global prefix, dirname, branches, bmarks
global marks, blob_marks, parsed_refs
global peer, mode, bad_mail, bad_name
global track_branches, force_push
global track_branches, force_push, is_tmp
alias = args[1]
url = args[2]
@ -833,6 +834,7 @@ def main(args):
bmarks = {}
blob_marks = {}
parsed_refs = {}
marks = None
repo = get_repo(url, alias)
prefix = 'refs/hg/%s' % alias
@ -860,9 +862,13 @@ def main(args):
die('unhandled command: %s' % line)
sys.stdout.flush()
def bye():
if not marks:
return
if not is_tmp:
marks.store()
else:
shutil.rmtree(dirname)
atexit.register(bye)
sys.exit(main(sys.argv))