Skip to content

Commit

Permalink
remote-hg: fix bad state issue
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed Apr 11, 2013
1 parent 2e8e813 commit 2594a79
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion contrib/remote-helpers/git-remote-hg
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import json
import shutil
import subprocess
import urllib
import atexit

#
# If you want to switch to hg-git compatibility mode:
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -833,6 +834,7 @@ def main(args):
bmarks = {}
blob_marks = {}
parsed_refs = {}
marks = None

repo = get_repo(url, alias)
prefix = 'refs/hg/%s' % alias
Expand Down Expand Up @@ -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))

0 comments on commit 2594a79

Please sign in to comment.