From patchwork Fri Apr  3 20:44:36 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: hgk: display committer name when set by hg-git
From: Andrew Shadura <andrew@shadura.me>
X-Patchwork-Id: 8483
Message-Id: <0b1f173f545c2297614b.1428093876@localhost.localdomain>
To: mercurial-devel@selenic.com
Date: Fri, 03 Apr 2015 22:44:36 +0200

# HG changeset patch
# User Andrew Shadura <andrew@shadura.me>
# Date 1428093865 -7200
#      Fri Apr 03 22:44:25 2015 +0200
# Node ID 0b1f173f545c2297614b2735187fedea3eafa423
# Parent  1951a31019d39885a39db58a3a389b196d65cc63
hgk: display committer name when set by hg-git

diff --git a/contrib/hgk b/contrib/hgk
--- a/contrib/hgk
+++ b/contrib/hgk
@@ -2516,6 +2516,9 @@ proc selectline {l isnew} {
     }
     $ctext insert end "User: [lindex $info 1]\n"
     $ctext insert end "Date: [lindex $info 2]\n"
+    if {[lindex $info 3] ne ""} {
+	$ctext insert end "Committer: [lindex $info 3]\n"
+    }
     if {[info exists idbookmarks($id)]} {
 	$ctext insert end "Bookmarks:"
 	foreach bookmark $idbookmarks($id) {
diff --git a/hgext/hgk.py b/hgext/hgk.py
--- a/hgext/hgk.py
+++ b/hgext/hgk.py
@@ -118,14 +118,11 @@ def catcommit(ui, repo, n, prefix, ctx=N
     date = ctx.date()
     description = ctx.description().replace("\0", "")
     lines = description.splitlines()
-    if lines and lines[-1].startswith('committer:'):
-        committer = lines[-1].split(': ')[1].rstrip()
-    else:
-        committer = ""
+    ui.write(("author %s %s %s\n" % (ctx.user(), int(date[0]), date[1])))
 
-    ui.write(("author %s %s %s\n" % (ctx.user(), int(date[0]), date[1])))
-    if committer != '':
-        ui.write(("committer %s %s %s\n" % (committer, int(date[0]), date[1])))
+    if 'committer' in ctx.extra():
+        ui.write(("committer %s\n" % ctx.extra()['committer']))
+
     ui.write(("revision %d\n" % ctx.rev()))
     ui.write(("branch %s\n" % ctx.branch()))
     if obsolete.isenabled(repo, obsolete.createmarkersopt):