From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Sverre Rabbelier <srabbelier@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Ilari Liusvaara <ilari.liusvaara@elisanet.fi>,
Daniel Barkalow <barkalow@iabervon.org>,
Michael J Gruber <git@drmicha.warpmail.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v6 08/16] remote-hg: add compat for hg-git author fixes
Date: Sun, 4 Nov 2012 03:13:30 +0100 [thread overview]
Message-ID: <1351995218-19889-9-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1351995218-19889-1-git-send-email-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/remote-helpers/git-remote-hg | 59 ++++++++++++++++++++++++++++++++----
1 file changed, 53 insertions(+), 6 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index d585756..9db4b7e 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -17,6 +17,7 @@ import os
import json
import shutil
import subprocess
+import urllib
#
# If you want to switch to hg-git compatibility mode:
@@ -35,6 +36,7 @@ import subprocess
NAME_RE = re.compile('^([^<>]+)')
AUTHOR_RE = re.compile('^([^<>]+?)? ?<([^<>]+)>$')
+AUTHOR_HG_RE = re.compile('^(.*?) ?<(.+?)(?:>(.+)?)?$')
RAW_AUTHOR_RE = re.compile('^(\w+) (?:(.+)? )?<(.+)> (\d+) ([+-]\d+)')
def die(msg, *args):
@@ -152,12 +154,20 @@ class Parser:
return sys.stdin.read(size)
def get_author(self):
+ global bad_mail
+
+ ex = None
m = RAW_AUTHOR_RE.match(self.line)
if not m:
return None
_, name, email, date, tz = m.groups()
+ if name and 'ext:' in name:
+ m = re.match('^(.+?) ext:\((.+)\)$', name)
+ if m:
+ name = m.group(1)
+ ex = urllib.unquote(m.group(2))
- if email != 'unknown':
+ if email != bad_mail:
if name:
user = '%s <%s>' % (name, email)
else:
@@ -165,6 +175,9 @@ class Parser:
else:
user = name
+ if ex:
+ user += ex
+
tz = int(tz)
tz = ((tz / 100) * 3600) + ((tz % 100) * 60)
return (user, int(date), -tz)
@@ -194,9 +207,9 @@ def get_filechanges(repo, ctx, parent):
return added | modified, removed
-def fixup_user(user):
- user = user.replace('"', '')
+def fixup_user_git(user):
name = mail = None
+ user = user.replace('"', '')
m = AUTHOR_RE.match(user)
if m:
name = m.group(1)
@@ -205,11 +218,41 @@ def fixup_user(user):
m = NAME_RE.match(user)
if m:
name = m.group(1).strip()
+ return (name, mail)
+
+def fixup_user_hg(user):
+ def sanitize(name):
+ # stole this from hg-git
+ return re.sub('[<>\n]', '?', name.lstrip('< ').rstrip('> '))
+
+ m = AUTHOR_HG_RE.match(user)
+ if m:
+ name = sanitize(m.group(1))
+ mail = sanitize(m.group(2))
+ ex = m.group(3)
+ if ex:
+ name += ' ext:(' + urllib.quote(ex) + ')'
+ else:
+ name = sanitize(user)
+ if '@' in user:
+ mail = name
+ else:
+ mail = None
+
+ return (name, mail)
+
+def fixup_user(user):
+ global mode, bad_mail
+
+ if mode == 'git':
+ name, mail = fixup_user_git(user)
+ else:
+ name, mail = fixup_user_hg(user)
if not name:
- name = 'Unknown'
+ name = bad_name
if not mail:
- mail = 'unknown'
+ mail = bad_mail
return '%s <%s>' % (name, mail)
@@ -660,7 +703,7 @@ def do_export(parser):
def main(args):
global prefix, dirname, branches, bmarks
global marks, blob_marks, parsed_refs
- global peer, mode
+ global peer, mode, bad_mail, bad_name
alias = args[1]
url = args[2]
@@ -676,8 +719,12 @@ def main(args):
if hg_git_compat:
mode = 'hg'
+ bad_mail = 'none@none'
+ bad_name = ''
else:
mode = 'git'
+ bad_mail = 'unknown'
+ bad_name = 'Unknown'
if alias[4:] == url:
is_tmp = True
--
1.8.0
next prev parent reply other threads:[~2012-11-04 2:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-04 2:13 [PATCH v6 00/16] New remote-hg helper:w Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 01/16] Add new remote-hg transport helper Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 02/16] remote-hg: add support for pushing Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 03/16] remote-hg: add support for remote pushing Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 04/16] remote-hg: add support to push URLs Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 05/16] remote-hg: make sure the encoding is correct Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 06/16] remote-hg: match hg merge behavior Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 07/16] remote-hg: add support for hg-git compat mode Felipe Contreras
2012-11-28 20:23 ` W. Trevor King
2013-01-08 15:47 ` [PATCH] remote-hg: Fix biridectionality -> bidirectionality typos W. Trevor King
2013-01-08 17:32 ` Junio C Hamano
2013-01-08 17:50 ` W. Trevor King
2013-01-08 18:10 ` Junio C Hamano
2012-11-04 2:13 ` Felipe Contreras [this message]
2012-11-04 2:13 ` [PATCH v6 09/16] remote-hg: fake bookmark when there's none Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 10/16] remote-hg: add basic tests Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 11/16] test-lib: avoid full path to store test results Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 12/16] remote-hg: add bidirectional tests Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 13/16] remote-hg: add tests to compare with hg-git Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 14/16] remote-hg: add extra author test Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 15/16] remote-hg: add option to not track branches Felipe Contreras
2012-11-04 2:13 ` [PATCH v6 16/16] remote-hg: the author email can be null Felipe Contreras
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=1351995218-19889-9-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ilari.liusvaara@elisanet.fi \
--cc=peff@peff.net \
--cc=srabbelier@gmail.com \
/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).