From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v4 18/21] remote-hg: fix bad state issue
Date: Thu, 11 Apr 2013 07:23:14 -0500 [thread overview]
Message-ID: <1365682997-11329-19-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1365682997-11329-1-git-send-email-felipe.contreras@gmail.com>
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>
---
contrib/remote-helpers/git-remote-hg | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 3eb07dc..e3d7f77 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -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))
--
1.8.2.1
next prev parent reply other threads:[~2013-04-11 12:25 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-11 12:22 [PATCH v4 00/21] remote-hg: general updates Felipe Contreras
2013-04-11 12:22 ` [PATCH v4 01/21] remote-hg: trivial cleanups Felipe Contreras
2013-04-11 12:22 ` [PATCH v4 02/21] remote-hg: add missing config variable in doc Felipe Contreras
2013-04-11 12:22 ` [PATCH v4 03/21] remote-hg: properly report errors on bookmark pushes Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 04/21] remote-hg: fix for files with spaces Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 05/21] remote-hg: make sure fake bookmarks are updated Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 06/21] remote-hg: trivial test cleanups Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 07/21] remote-hg: redirect buggy mercurial output Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 08/21] remote-hg: split bookmark handling Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 09/21] remote-hg: refactor export Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 10/21] remote-hg: update remote bookmarks Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 11/21] remote-hg: update tags globally Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 12/21] remote-hg: push to the appropriate branch Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 13/21] remote-hg: force remote push Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 14/21] remote-hg: show more proper errors Felipe Contreras
2013-05-27 16:30 ` Antoine Pelisse
2013-05-27 16:49 ` Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 15/21] remote-hg: add basic author tests Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 16/21] remote-hg: add simple mail test Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 17/21] remote-hg: add 'insecure' option Felipe Contreras
2013-04-11 12:23 ` Felipe Contreras [this message]
2013-04-11 12:23 ` [PATCH v4 19/21] remote-hg: document location of stored hg repository Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 20/21] remote-hg: fix bad file paths Felipe Contreras
2013-04-11 12:23 ` [PATCH v4 21/21] remote-hg: activate graphlog extension for hg_log() Felipe Contreras
2013-04-11 17:50 ` [PATCH v4 00/21] remote-hg: general updates Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1365682997-11329-19-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).