Rev 4565: Remove one DummyProgress and fix a typo in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Jul 24 01:06:56 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4565 [merge]
revision-id: pqm at pqm.ubuntu.com-20090724000654-q6gwe0bpgk1buemd
parent: pqm at pqm.ubuntu.com-20090723202846-qpxxgq1j5805yrf6
parent: mbp at sourcefrog.net-20090605231523-fzaebdzckp38hoir
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-07-24 01:06:54 +0100
message:
Remove one DummyProgress and fix a typo
modified:
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
=== modified file 'bzrlib/bundle/serializer/v08.py'
--- a/bzrlib/bundle/serializer/v08.py 2009-05-06 05:36:28 +0000
+++ b/bzrlib/bundle/serializer/v08.py 2009-06-05 23:15:23 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005, 2006, 2009 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,10 @@
import os
-from bzrlib import errors
+from bzrlib import (
+ errors,
+ ui,
+ )
from bzrlib.bundle.serializer import (BundleSerializer,
_get_bundle_header,
)
@@ -27,9 +30,7 @@
from bzrlib.bundle.bundle_data import (RevisionInfo, BundleInfo, BundleTree)
from bzrlib.diff import internal_diff
from bzrlib.osutils import pathjoin
-from bzrlib.progress import DummyProgress
from bzrlib.revision import NULL_REVISION
-import bzrlib.ui
from bzrlib.testament import StrictTestament
from bzrlib.timestamp import (
format_highres_date,
@@ -119,12 +120,11 @@
source.lock_read()
try:
self._write_main_header()
- pb = DummyProgress()
+ pb = ui.ui_factory.nested_progress_bar()
try:
self._write_revisions(pb)
finally:
- pass
- #pb.finished()
+ pb.finished()
finally:
source.unlock()
@@ -183,7 +183,7 @@
i_max = len(self.revision_ids)
for i, rev_id in enumerate(self.revision_ids):
- pb.update("Generating revsion data", i, i_max)
+ pb.update("Generating revision data", i, i_max)
rev = self.source.get_revision(rev_id)
if rev_id == last_rev_id:
rev_tree = last_rev_tree
More information about the bazaar-commits
mailing list