##// END OF EJS Templates
hgk: display branch name in diff header
Patrick Mezard -
r5859:e0f86c1e default
parent child Browse files
Show More
@@ -274,6 +274,7 b' proc parsecommit {id contents listed old'
274 set comname {}
274 set comname {}
275 set comdate {}
275 set comdate {}
276 set rev {}
276 set rev {}
277 set branch {}
277 if {![info exists nchildren($id)]} {
278 if {![info exists nchildren($id)]} {
278 set children($id) {}
279 set children($id) {}
279 set nchildren($id) 0
280 set nchildren($id) 0
@@ -310,6 +311,8 b' proc parsecommit {id contents listed old'
310 set comname [join [lrange $line 1 [expr {$x - 1}]]]
311 set comname [join [lrange $line 1 [expr {$x - 1}]]]
311 } elseif {$tag == "revision"} {
312 } elseif {$tag == "revision"} {
312 set rev [lindex $line 1]
313 set rev [lindex $line 1]
314 } elseif {$tag == "branch"} {
315 set branch [join [lrange $line 1 end]]
313 }
316 }
314 }
317 }
315 } else {
318 } else {
@@ -334,7 +337,7 b' proc parsecommit {id contents listed old'
334 set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"]
337 set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"]
335 }
338 }
336 set commitinfo($id) [list $headline $auname $audate \
339 set commitinfo($id) [list $headline $auname $audate \
337 $comname $comdate $comment $rev]
340 $comname $comdate $comment $rev $branch]
338 }
341 }
339
342
340 proc readrefs {} {
343 proc readrefs {} {
@@ -2286,6 +2289,9 b' proc selectline {l isnew} {'
2286 $ctext mark gravity fmark.0 left
2289 $ctext mark gravity fmark.0 left
2287 set info $commitinfo($id)
2290 set info $commitinfo($id)
2288 $ctext insert end "Revision: [lindex $info 6]\n"
2291 $ctext insert end "Revision: [lindex $info 6]\n"
2292 if {[llength [lindex $info 7]] > 0} {
2293 $ctext insert end "Branch: [lindex $info 7]\n"
2294 }
2289 $ctext insert end "Author: [lindex $info 1] [lindex $info 2]\n"
2295 $ctext insert end "Author: [lindex $info 1] [lindex $info 2]\n"
2290 $ctext insert end "Committer: [lindex $info 3] [lindex $info 4]\n"
2296 $ctext insert end "Committer: [lindex $info 3] [lindex $info 4]\n"
2291 if {[info exists idtags($id)]} {
2297 if {[info exists idtags($id)]} {
@@ -121,6 +121,7 b' def catcommit(repo, n, prefix, ctx=None)'
121 print "author %s %s %s" % (ctx.user(), int(date[0]), date[1])
121 print "author %s %s %s" % (ctx.user(), int(date[0]), date[1])
122 print "committer %s %s %s" % (committer, int(date[0]), date[1])
122 print "committer %s %s %s" % (committer, int(date[0]), date[1])
123 print "revision %d" % ctx.rev()
123 print "revision %d" % ctx.rev()
124 print "branch %s" % ctx.branch()
124 print ""
125 print ""
125 if prefix != "":
126 if prefix != "":
126 print "%s%s" % (prefix, description.replace('\n', nlprefix).strip())
127 print "%s%s" % (prefix, description.replace('\n', nlprefix).strip())
General Comments 0
You need to be logged in to leave comments. Login now