Merge lp:~jelmer/bzr-cvsps-import/avoid-note into lp:bzr-cvsps-import

[Jelmer Vernooij]

Avoid ProgressTask.note, which no longer exists.

[John A Meinel (jameinel)]

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

On 03/24/2011 06:53 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-cvsps-import/avoid-note into lp:bzr-cvsps-import.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-cvsps-import/avoid-note/+merge/54749
>
> Avoid ProgressTask.note, which no longer exists.

 merge: approve
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2LmLYACgkQJdeBCYSNAAOZGACgyFjgc1NxCn5812wFrpHIP31q
SvIAn31OW/u6Fm2RZtmMf/ntH+NlPKRc
=UNFo
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'cvsps/importer.py'
--- cvsps/importer.py	2011-02-27 22:45:04 +0000
+++ cvsps/importer.py	2011-03-24 17:55:30 +0000
@@ -1217,8 +1217,7 @@
         else:
             cvsps_dump_path = osutils.pathjoin(self._staging_path,
                                                self._module_fname + '.dump')
-            if pb is not None:
-                pb.note('Creating cvsps dump file: %s', cvsps_dump_path)
+            trace.note('Creating cvsps dump file: %s', cvsps_dump_path)
             # Create a dump file
             cvsps_controller = CVSPSController(cvs_root=self._cvs_root,
                                                cvs_module=self._cvs_module)

=== modified file 'cvsps/parser.py'
--- cvsps/parser.py	2011-02-24 00:19:59 +0000
+++ cvsps/parser.py	2011-03-24 17:55:30 +0000
@@ -16,6 +16,8 @@
 
 """The functionality for parsing a cvsps dump file"""
 
+from bzrlib import trace
+
 import calendar
 import time
 
@@ -268,7 +270,7 @@
         if self._pb is not None:
             self._pb.update('reading patchsets', 0, len(self._patchsets))
 
-            self._pb.note('Read %s patchsets (string cache hits: %s, total: %s)',
+            trace.note('Read %s patchsets (string cache hits: %s, total: %s)',
                 len(self._patchsets), self._cache_hits,
                 len(self._string_cache))