Merge lp:~maxb/bzr-cvsps-import/path-gen-fixup into lp:bzr-cvsps-import

[Max Bowsher]

[Jelmer Vernooij (jelmer)]

review: Approve (code)

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

It would be nice if you could include a bit of coverletter with your
merge proposals, so that we can understand the context.

- From what I can tell, you are just changing the "." => "" earlier in
the code, which seems fine with me, as long as things still work
correctly.

 merge: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1tTAMACgkQJdeBCYSNAAPmNwCgtAHZOQYxK59EVAQQDrT09YKd
73oAnRD+jQX0DTSkaO7ccHa8jmFkAwvq
=nArK
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'cvsps/importer.py'
--- cvsps/importer.py	2009-09-28 14:09:16 +0000
+++ cvsps/importer.py	2011-02-24 00:23:39 +0000
@@ -492,12 +492,12 @@
 
     def __init__(self, cvs_root, cvs_module, use_cvs_for_text=True):
         self._cvs_root = cvs_root
+        if cvs_module == '.':
+            cvs_module = ''
         self._cvs_module = cvs_module
         self._cvs_modpath = osutils.pathjoin(cvs_root, cvs_module) \
                             .encode(sys.getfilesystemencoding() or 'utf-8')
         self._use_cvs_for_text = use_cvs_for_text # Do we use 'cvs' or 'co'?
-        if self._cvs_module == '.':
-            self._cvs_module = ''
 
     def update_file(self, target_base, filename, revision):
         """Update the specific file to the given revision.