# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1200433764 21600
# Node ID b860b116dea4881b779c5d9bd0203b42ac9db8b0
# Parent  e7ed5d07cc4c987a5c9e3fbb5476acbf5cb76d1f# Parent  493632bb171c42b272fec8b7d873b945eede13f3
Merge with crew

diff -r e7ed5d07cc4c -r b860b116dea4 contrib/hgk
--- a/contrib/hgk	Fri Jan 11 23:30:56 2008 +0200
+++ b/contrib/hgk	Tue Jan 15 15:49:24 2008 -0600
@@ -274,6 +274,7 @@
     set comname {}
     set comdate {}
     set rev {}
+    set branch {}
     if {![info exists nchildren($id)]} {
 	set children($id) {}
 	set nchildren($id) 0
@@ -310,6 +311,8 @@
 		    set comname [join [lrange $line 1 [expr {$x - 1}]]]
 		} elseif {$tag == "revision"} {
 		    set rev [lindex $line 1]
+        } elseif {$tag == "branch"} {
+		    set branch [join [lrange $line 1 end]]
 		}
 	    }
 	} else {
@@ -334,7 +337,7 @@
 	set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"]
     }
     set commitinfo($id) [list $headline $auname $audate \
-			     $comname $comdate $comment $rev]
+			     $comname $comdate $comment $rev $branch]
 }
 
 proc readrefs {} {
@@ -2286,6 +2289,9 @@
     $ctext mark gravity fmark.0 left
     set info $commitinfo($id)
     $ctext insert end "Revision: [lindex $info 6]\n"
+    if {[llength [lindex $info 7]] > 0} {
+        $ctext insert end "Branch: [lindex $info 7]\n"
+    }
     $ctext insert end "Author: [lindex $info 1]  [lindex $info 2]\n"
     $ctext insert end "Committer: [lindex $info 3]  [lindex $info 4]\n"
     if {[info exists idtags($id)]} {
diff -r e7ed5d07cc4c -r b860b116dea4 hgext/convert/cvs.py
--- a/hgext/convert/cvs.py	Fri Jan 11 23:30:56 2008 +0200
+++ b/hgext/convert/cvs.py	Tue Jan 15 15:49:24 2008 -0600
@@ -179,7 +179,7 @@
 
         if conntype != "pserver":
             if conntype == "rsh":
-                rsh = os.environ.get("CVS_RSH" or "rsh")
+                rsh = os.environ.get("CVS_RSH") or "ssh"
                 if user:
                     cmd = [rsh, '-l', user, host] + cmd
                 else:
diff -r e7ed5d07cc4c -r b860b116dea4 hgext/hgk.py
--- a/hgext/hgk.py	Fri Jan 11 23:30:56 2008 +0200
+++ b/hgext/hgk.py	Tue Jan 15 15:49:24 2008 -0600
@@ -121,6 +121,7 @@
     print "author %s %s %s" % (ctx.user(), int(date[0]), date[1])
     print "committer %s %s %s" % (committer, int(date[0]), date[1])
     print "revision %d" % ctx.rev()
+    print "branch %s" % ctx.branch()
     print ""
     if prefix != "":
         print "%s%s" % (prefix, description.replace('\n', nlprefix).strip())