From: Antoine Pelisse <apelisse@gmail.com>
To: git@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Antoine Pelisse <apelisse@gmail.com>
Subject: [PATCH] remote-hg: unquote C-style paths when exporting
Date: Fri, 18 Oct 2013 19:03:41 +0200 [thread overview]
Message-ID: <1382115821-12586-1-git-send-email-apelisse@gmail.com> (raw)
git-fast-import documentation says that paths can be C-style quoted.
Unfortunately, the current remote-hg helper doesn't unquote quoted
path and pass them as-is to Mercurial when the commit is created.
This result in the following situation:
- clone a mercurial repository with git
- Add a file with space: `mkdir dir/foo\ bar`
- Commit that new file, and push the change to mercurial
- The mercurial repository as now a new directory named '"dir', which
contains a file named 'foo bar"'
Use python ast.literal_eval to unquote the string if it starts with ".
It has been tested with quotes, spaces, and utf-8 encoded file-names.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
---
contrib/remote-helpers/git-remote-hg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 92d994e..0141949 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -14,6 +14,7 @@
from mercurial import hg, ui, bookmarks, context, encoding, node, error, extensions, discovery, util
+import ast
import re
import sys
import os
@@ -742,6 +743,8 @@ def parse_commit(parser):
f = { 'deleted' : True }
else:
die('Unknown file command: %s' % line)
+ if path.startswith('"'):
+ path = ast.literal_eval(path)
files[path] = f
# only export the commits if we are on an internal proxy repo
--
1.8.4.1.507.g9768648.dirty
next reply other threads:[~2013-10-18 17:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-18 17:03 Antoine Pelisse [this message]
2013-10-22 19:13 ` [PATCH] remote-hg: unquote C-style paths when exporting Junio C Hamano
2013-10-22 20:49 ` Antoine Pelisse
2013-10-23 0:45 ` Felipe Contreras
2013-10-23 8:38 ` Antoine Pelisse
2013-10-23 15:44 ` Re* " Junio C Hamano
2013-10-23 15:53 ` Antoine Pelisse
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382115821-12586-1-git-send-email-apelisse@gmail.com \
--to=apelisse@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).