From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Hansen Subject: [PATCH 7/7] remote-bzr, remote-hg: fix email address regular expression Date: Sun, 10 Nov 2013 23:05:12 -0500 Message-ID: <1384142712-2936-8-git-send-email-rhansen@bbn.com> References: <1384142712-2936-1-git-send-email-rhansen@bbn.com> Cc: felipe.contreras@gmail.com, Richard Hansen To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Nov 11 05:08:24 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VfinX-0004dp-Lk for gcvg-git-2@plane.gmane.org; Mon, 11 Nov 2013 05:08:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752571Ab3KKEIU (ORCPT ); Sun, 10 Nov 2013 23:08:20 -0500 Received: from smtp.bbn.com ([128.33.1.81]:52786 "EHLO smtp.bbn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752541Ab3KKEIS (ORCPT ); Sun, 10 Nov 2013 23:08:18 -0500 Received: from socket.bbn.com ([192.1.120.102]:44760) by smtp.bbn.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1VfinQ-000JVP-Q1; Sun, 10 Nov 2013 23:08:16 -0500 X-Submitted: to socket.bbn.com (Postfix) with ESMTPSA id 142143FF72 X-Mailer: git-send-email 1.8.5.rc1.207.gc17dd22 In-Reply-To: <1384142712-2936-1-git-send-email-rhansen@bbn.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Before, strings like "foo.bar@example.com" would be converted to "foo. " when they should be "unknown ". Signed-off-by: Richard Hansen --- contrib/remote-helpers/git-remote-bzr | 7 +++---- contrib/remote-helpers/git-remote-hg | 7 +++---- contrib/remote-helpers/test-hg.sh | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 054161a..7e34532 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -44,8 +44,8 @@ import StringIO import atexit, shutil, hashlib, urlparse, subprocess NAME_RE = re.compile('^([^<>]+)') -AUTHOR_RE = re.compile('^([^<>]+?)? ?<([^<>]*)>$') -EMAIL_RE = re.compile('^([^<>]+[^ \\\t<>])?\\b(?:[ \\t<>]*?)\\b([^ \\t<>]+@[^ \\t<>]+)') +AUTHOR_RE = re.compile('^([^<>]+?)? ?[<>]([^<>]*)(?:$|>)') +EMAIL_RE = re.compile(r'([^ \t<>]+@[^ \t<>]+)') RAW_AUTHOR_RE = re.compile('^(\w+) (.+)? <(.*)> (\d+) ([+-]\d+)') def die(msg, *args): @@ -193,8 +193,7 @@ def fixup_user(user): else: m = EMAIL_RE.match(user) if m: - name = m.group(1) - mail = m.group(2) + mail = m.group(1) else: m = NAME_RE.match(user) if m: diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index c6026b9..30402d5 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -51,8 +51,8 @@ import time as ptime # NAME_RE = re.compile('^([^<>]+)') -AUTHOR_RE = re.compile('^([^<>]+?)? ?<([^<>]*)>$') -EMAIL_RE = re.compile('^([^<>]+[^ \\\t<>])?\\b(?:[ \\t<>]*?)\\b([^ \\t<>]+@[^ \\t<>]+)') +AUTHOR_RE = re.compile('^([^<>]+?)? ?[<>]([^<>]*)(?:$|>)') +EMAIL_RE = re.compile(r'([^ \t<>]+@[^ \t<>]+)') AUTHOR_HG_RE = re.compile('^(.*?) ?<(.*?)(?:>(.+)?)?$') RAW_AUTHOR_RE = re.compile('^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') @@ -316,8 +316,7 @@ def fixup_user_git(user): else: m = EMAIL_RE.match(user) if m: - name = m.group(1) - mail = m.group(2) + mail = m.group(1) else: m = NAME_RE.match(user) if m: diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 5eda265..9f5066b 100755 --- a/contrib/remote-helpers/test-hg.sh +++ b/contrib/remote-helpers/test-hg.sh @@ -218,7 +218,8 @@ test_expect_success 'authors' ' author_test eta "eta < test@example.com >" "eta " && author_test theta "theta >test@example.com>" "theta " && author_test iota "iota < test example com>" "iota " && - author_test kappa "kappa@example.com" "Unknown " + author_test kappa "kappa@example.com" "Unknown " && + author_test lambda "lambda.lambda@example.com" "Unknown " ) && git clone "hg::hgrepo" gitrepo && -- 1.8.5.rc1.207.gc17dd22