CVS to Bazaar importer

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

  1. path-gen-fixup
  2. Merge into trunk
Proposed by Max Bowsher
Status: Merged
Approved by: John A Meinel
Approved revision: 65
Merged at revision: 65
Proposed branch: lp:~maxb/bzr-cvsps-import/path-gen-fixup
Merge into: lp:bzr-cvsps-import
Diff against target: 18 lines (+2/-2)
1 file modified
cvsps/importer.py (+2/-2)
To merge this branch: bzr merge lp:~maxb/bzr-cvsps-import/path-gen-fixup
Reviewer Review Type Date Requested Status
John A Meinel Approve
Jelmer Vernooij (community) code Approve
Review via email: mp+51047@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve (code)
Revision history for this message
John A Meinel (jameinel) wrote :

-----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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cvsps/importer.py'
2--- cvsps/importer.py 2009-09-28 14:09:16 +0000
3+++ cvsps/importer.py 2011-02-24 00:23:39 +0000
4@@ -492,12 +492,12 @@
5
6 def __init__(self, cvs_root, cvs_module, use_cvs_for_text=True):
7 self._cvs_root = cvs_root
8+ if cvs_module == '.':
9+ cvs_module = ''
10 self._cvs_module = cvs_module
11 self._cvs_modpath = osutils.pathjoin(cvs_root, cvs_module) \
12 .encode(sys.getfilesystemencoding() or 'utf-8')
13 self._use_cvs_for_text = use_cvs_for_text # Do we use 'cvs' or 'co'?
14- if self._cvs_module == '.':
15- self._cvs_module = ''
16
17 def update_file(self, target_base, filename, revision):
18 """Update the specific file to the given revision.

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: