# HG changeset patch
# User leibold@AC-Fairway.eu.scansoft.com
# Date 1185801929 -7200
# Branch FixCVS
# Node ID 8be016ddc8bd9c97930b3b9dd1868270e8c675aa
# Parent  48ebd6a8399480a889410a130d98e6bf342bc3ca
CVS import: Support other .cvspass-file format.

diff -r 48ebd6a83994 -r 8be016ddc8bd hgext/convert/cvs.py
--- a/hgext/convert/cvs.py	Sat Jul 28 20:15:54 2007 +0200
+++ b/hgext/convert/cvs.py	Mon Jul 30 15:25:29 2007 +0200
@@ -116,6 +116,7 @@ class convert_cvs(converter_source):
         self.ui.status("connecting to %s\n" % root)
 
         if root.startswith(":pserver:"):
+            cmd = ['cvs -z9', 'server']
             root = root[9:]
             m = re.match(r'(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?(.*)',
                          root)
@@ -132,7 +133,6 @@ class convert_cvs(converter_source):
                 rr += str(port)
 
                 if not passw:
-                    passw = "A"
                     pf = open(os.path.join(os.environ["HOME"], ".cvspass"))
                     for l in pf:
                         # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
@@ -143,6 +143,25 @@ class convert_cvs(converter_source):
                             passw = p
                             break
                     pf.close()
+                    if not passw:
+                        passw = "A"
+                        rr = ":pserver:" + user + "@" + serv + ":"
+                        if port:
+                            rr2, port = "-", int(port)
+                        else:
+                            rr2, port = rr + root, 2401
+                        rr += str(port) + root
+
+                        pf = open(os.path.join(os.environ["HOME"], ".cvspass"))
+                        for l in pf:
+                            # /1 :pserver:cvs@mea.tmt.tele.fi:2401/cvsroot/zmailer Ah<Z
+                            m = re.match(r'(/\d+\s+/)?(.*)', l)
+                            l = m.group(2)
+                            dummy, w, p = l.split(' ', 2)
+                            if w in [rr, rr2]:
+                                passw = p
+                                break
+                        pf.close()
 
                 sck = socket.socket()
                 sck.connect((serv, port))