Mercurial > hg-stable

changeset 24604:ce8dd4fd2d5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgk: display committer name when set by hg-git
author Andrew Shadura <andrew@shadura.me>
date Fri, 03 Apr 2015 22:44:25 +0200
parents e74f819e9160
children 98744856b7d3
files contrib/hgk hgext/hgk.py
diffstat 2 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/hgk	Sat Mar 14 20:16:35 2015 +0900
+++ b/contrib/hgk	Fri Apr 03 22:44:25 2015 +0200
@@ -2516,6 +2516,9 @@
     }
     $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) {
--- a/hgext/hgk.py	Sat Mar 14 20:16:35 2015 +0900
+++ b/hgext/hgk.py	Fri Apr 03 22:44:25 2015 +0200
@@ -117,15 +117,11 @@
 
     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):