Merge with crew

contrib/hgk

@@ -274,6 +274,7 b' proc parsecommit {id contents listed old'
     set comname {}
     set comdate {}
     set rev {}
+    set branch {}
     if {![info exists nchildren($id)]} {
 	set children($id) {}
 	set nchildren($id) 0
@@ -310,6 +311,8 b' proc parsecommit {id contents listed old'
 		    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 b' proc parsecommit {id contents listed old'
 	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 b' proc selectline {l isnew} {'
     $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)]} {

hgext/convert/cvs.py

@@ -179,7 +179,7 b' class convert_cvs(converter_source):'
 
         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:

hgext/hgk.py

@@ -121,6 +121,7 b' def catcommit(repo, n, prefix, ctx=None)'
     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())