From: Felipe Contreras Date: Sat, 25 May 2013 02:29:56 GMT Subject: [PATCH v2 40/48] remote-hg: improve lightweight tag author Message-ID: <1369449004-17981-41-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1369449004-17981-1-git-send-email-felipe.contreras@gmail.com> Use git's committer. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index a1b22f7..fa76b3f 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -840,13 +840,23 @@ def write_tag(repo, tag, node, msg, author): p1 = tip.hex() p2 = '0' * 40 - if not author: - author = (None, 0, 0) - user, date, tz = author + if author: + user, date, tz = author + date_tz = (date, tz) + else: + cmd = ['git', 'var', 'GIT_COMMITTER_IDENT'] + process = subprocess.Popen(cmd, stdout=subprocess.PIPE) + output, _ = process.communicate() + m = re.match('^.* <.*>', output) + if m: + user = m.group(0) + else: + user = repo.ui.username() + date_tz = None ctx = context.memctx(repo, (p1, p2), msg, ['.hgtags'], getfilectx, - user, (date, tz), {'branch' : branch}) + user, date_tz, {'branch' : branch}) tmp = encoding.encoding encoding.encoding = 'utf-8' -- 1.8.3.rc3.312.g47657de