Rev 2601: No progress bar in noninteractive mode; rename DotsProgress to DotsProgressBar in http://sourcefrog.net/bzr/progress
Martin Pool
mbp at sourcefrog.net
Wed Jul 11 08:00:42 BST 2007
At http://sourcefrog.net/bzr/progress
------------------------------------------------------------
revno: 2601
revision-id: mbp at sourcefrog.net-20070711070040-ay8pjpf9jcz33wft
parent: mbp at sourcefrog.net-20070711064730-pwnhisgp2caf7nar
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Wed 2007-07-11 17:00:40 +1000
message:
No progress bar in noninteractive mode; rename DotsProgress to DotsProgressBar
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'NEWS'
--- a/NEWS 2007-07-11 06:47:30 +0000
+++ b/NEWS 2007-07-11 07:00:40 +0000
@@ -11,7 +11,8 @@
LIBRARY API BREAKS:
- * None yet ...
+ * ``DummyProgress`` renamed to ``DummyProgressBar`` for consistency
+ with other classes. (Martin Pool)
INTERNALS:
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-07-11 01:55:33 +0000
+++ b/bzrlib/builtins.py 2007-07-11 07:00:40 +0000
@@ -61,7 +61,7 @@
from bzrlib.commands import Command, display_command
from bzrlib.option import ListOption, Option, RegistryOption
-from bzrlib.progress import DummyProgress, ProgressPhase
+from bzrlib.progress import DummyProgressBar, ProgressPhase
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
@@ -3679,7 +3679,7 @@
merge_type=None,
file_list=None, show_base=False, reprocess=False,
pull=False,
- pb=DummyProgress(),
+ pb=DummyProgressBar(),
change_reporter=None,
other_rev_id=None):
"""Merge changes into a tree.
=== modified file 'bzrlib/bundle/serializer/v08.py'
--- a/bzrlib/bundle/serializer/v08.py 2007-04-25 16:56:25 +0000
+++ b/bzrlib/bundle/serializer/v08.py 2007-07-11 07:00:40 +0000
@@ -27,7 +27,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.progress import DummyProgressBar
from bzrlib.revision import NULL_REVISION
import bzrlib.ui
from bzrlib.testament import StrictTestament
@@ -119,7 +119,7 @@
source.lock_read()
try:
self._write_main_header()
- pb = DummyProgress()
+ pb = DummyProgressBar()
try:
self._write_revisions(pb)
finally:
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py 2007-06-27 07:37:53 +0000
+++ b/bzrlib/knit.py 2007-07-11 07:00:40 +0000
@@ -875,7 +875,7 @@
else:
version_ids = [osutils.safe_revision_id(v) for v in version_ids]
if pb is None:
- pb = progress.DummyProgress()
+ pb = progress.DummyProgressBar()
# we don't care about inclusions, the caller cares.
# but we need to setup a list of records to visit.
# we need version_id, position, length
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py 2007-06-21 03:29:39 +0000
+++ b/bzrlib/merge.py 2007-07-11 07:00:40 +0000
@@ -40,7 +40,7 @@
)
from bzrlib.merge3 import Merge3
from bzrlib.osutils import rename, pathjoin
-from progress import DummyProgress, ProgressPhase
+from progress import DummyProgressBar, ProgressPhase
from bzrlib.revision import (is_ancestor, NULL_REVISION, ensure_null)
from bzrlib.textfile import check_text_lines
from bzrlib.trace import mutter, warning, note
@@ -98,7 +98,7 @@
class Merger(object):
def __init__(self, this_branch, other_tree=None, base_tree=None,
- this_tree=None, pb=DummyProgress(), change_reporter=None,
+ this_tree=None, pb=DummyProgressBar(), change_reporter=None,
recurse='down'):
object.__init__(self)
assert this_tree is not None, "this_tree is required"
@@ -426,7 +426,7 @@
def __init__(self, working_tree, this_tree, base_tree, other_tree,
interesting_ids=None, reprocess=False, show_base=False,
- pb=DummyProgress(), pp=None, change_reporter=None):
+ pb=DummyProgressBar(), pp=None, change_reporter=None):
"""Initialize the merger object and perform the merge."""
object.__init__(self)
self.this_tree = working_tree
@@ -896,7 +896,7 @@
supports_show_base = False
def __init__(self, working_tree, this_tree, base_tree, other_tree,
- interesting_ids=None, pb=DummyProgress(), pp=None,
+ interesting_ids=None, pb=DummyProgressBar(), pp=None,
reprocess=False, change_reporter=None):
self.this_revision_tree = self._get_revision_tree(this_tree)
self.other_revision_tree = self._get_revision_tree(other_tree)
@@ -1011,7 +1011,7 @@
other_rev_id=None,
interesting_files=None,
this_tree=None,
- pb=DummyProgress(),
+ pb=DummyProgressBar(),
change_reporter=None):
"""Primary interface for merging.
=== modified file 'bzrlib/progress.py'
--- a/bzrlib/progress.py 2007-07-11 06:47:30 +0000
+++ b/bzrlib/progress.py 2007-07-11 07:00:40 +0000
@@ -79,7 +79,7 @@
if _supports_progress(to_file):
return TTYProgressBar(to_file=to_file, **kwargs)
else:
- return DummyProgress(to_file=to_file, **kwargs)
+ return DummyProgressBar(to_file=to_file, **kwargs)
else:
# Minor sanitation to prevent spurious errors
requested_bar_type = requested_bar_type.lower().strip()
@@ -206,7 +206,7 @@
return ChildProgress(**kwargs)
-class DummyProgress(_BaseProgressBar):
+class DummyProgressBar(_BaseProgressBar):
"""Progress-bar standin that does nothing.
This can be used as the default argument for methods that
@@ -227,11 +227,15 @@
"""See _BaseProgressBar.note()."""
def child_progress(self, **kwargs):
- return DummyProgress(**kwargs)
-
-
-_progress_bar_types['dummy'] = DummyProgress
-_progress_bar_types['none'] = DummyProgress
+ return DummyProgressBar(**kwargs)
+
+
+# deprecated name from bzr 0.19
+DummyProgress = DummyProgressBar
+
+
+_progress_bar_types['dummy'] = DummyProgressBar
+_progress_bar_types['none'] = DummyProgressBar
class DotsProgressBar(_BaseProgressBar):
=== modified file 'bzrlib/revision.py'
--- a/bzrlib/revision.py 2007-06-21 03:29:39 +0000
+++ b/bzrlib/revision.py 2007-07-11 07:00:40 +0000
@@ -26,7 +26,7 @@
select_farthest,
)
from bzrlib.osutils import contains_whitespace
-from bzrlib.progress import DummyProgress
+from bzrlib.progress import DummyProgressBar
from bzrlib.symbol_versioning import (deprecated_function,
zero_eight,
)
@@ -244,7 +244,7 @@
def common_ancestor(revision_a, revision_b, revision_source,
- pb=DummyProgress()):
+ pb=DummyProgressBar()):
if None in (revision_a, revision_b):
return None
if NULL_REVISION in (revision_a, revision_b):
=== modified file 'bzrlib/tests/interrepository_implementations/test_interrepository.py'
--- a/bzrlib/tests/interrepository_implementations/test_interrepository.py 2007-03-07 01:54:13 +0000
+++ b/bzrlib/tests/interrepository_implementations/test_interrepository.py 2007-07-11 07:00:40 +0000
@@ -135,7 +135,7 @@
# fetch with a limit of NULL_REVISION and an explicit progress bar.
repo.fetch(tree_a.branch.repository,
revision_id=NULL_REVISION,
- pb=bzrlib.progress.DummyProgress())
+ pb=bzrlib.progress.DummyProgressBar())
# nothing should have been pushed
self.assertFalse(repo.has_revision('rev1'))
# fetch with a default limit (grab everything)
=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py 2007-06-22 05:05:22 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py 2007-07-11 07:00:40 +0000
@@ -174,7 +174,7 @@
raise TestSkipped('Cannot fetch from model2 to model1')
repo.fetch(tree_a.branch.repository,
revision_id=None,
- pb=bzrlib.progress.DummyProgress())
+ pb=bzrlib.progress.DummyProgressBar())
def test_fetch_knit3(self):
# create a repository of the sort we are testing.
=== modified file 'bzrlib/tests/test_progress.py'
--- a/bzrlib/tests/test_progress.py 2007-07-11 06:47:30 +0000
+++ b/bzrlib/tests/test_progress.py 2007-07-11 07:00:40 +0000
@@ -19,7 +19,7 @@
from bzrlib import errors
from bzrlib.progress import (
- DummyProgress,
+ DummyProgressBar,
ChildProgress,
TTYProgressBar,
DotsProgressBar,
@@ -64,7 +64,7 @@
class TestProgress(TestCase):
def setUp(self):
- q = DummyProgress()
+ q = DummyProgressBar()
self.top = ChildProgress(_stack=FakeStack(q))
def test_propogation(self):
@@ -98,7 +98,7 @@
def test_implementations(self):
for implementation in (TTYProgressBar, DotsProgressBar,
- DummyProgress):
+ DummyProgressBar):
self.check_parent_handling(implementation)
def check_parent_handling(self, parentclass):
@@ -112,7 +112,7 @@
def test_stacking(self):
self.check_stack(TTYProgressBar, ChildProgress)
self.check_stack(DotsProgressBar, ChildProgress)
- self.check_stack(DummyProgress, DummyProgress)
+ self.check_stack(DummyProgressBar, DummyProgressBar)
def check_stack(self, parent_class, child_class):
stack = ProgressBarStack(klass=parent_class, to_file=StringIO())
@@ -247,7 +247,7 @@
def test_noninteractive_progress(self):
out = _NonTTYStringIO()
pb = self.get_nested(out, 'xterm')
- self.assertIsInstance(pb, DummyProgress)
+ self.assertIsInstance(pb, DummyProgressBar)
try:
pb.update('foo', 1, 2)
pb.update('bar', 2, 2)
@@ -276,14 +276,14 @@
out = cStringIO.StringIO()
pb = self.get_nested(out, 'xterm')
pb.finished()
- self.assertIsInstance(pb, DummyProgress)
+ self.assertIsInstance(pb, DummyProgressBar)
def test_dumb_progress(self):
# using a terminal that can't do cursor movement
out = _TTYStringIO()
pb = self.get_nested(out, 'dumb')
pb.finished()
- self.assertIsInstance(pb, DummyProgress)
+ self.assertIsInstance(pb, DummyProgressBar)
def test_progress_env_tty(self):
# The environ variable BZR_PROGRESS_BAR controls what type of
@@ -302,7 +302,7 @@
out = _TTYStringIO()
pb = self.get_nested(out, 'xterm', 'none')
pb.finished()
- self.assertIsInstance(pb, DummyProgress)
+ self.assertIsInstance(pb, DummyProgressBar)
def test_progress_env_invalid(self):
out = _TTYStringIO()
=== modified file 'bzrlib/tests/test_upgrade.py'
--- a/bzrlib/tests/test_upgrade.py 2007-03-06 01:15:08 +0000
+++ b/bzrlib/tests/test_upgrade.py 2007-07-11 07:00:40 +0000
@@ -171,7 +171,7 @@
branch.set_push_location('file:///IJ')
target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
converter = branch.bzrdir._format.get_converter(target)
- converter.convert(branch.bzrdir, progress.DummyProgress())
+ converter.convert(branch.bzrdir, progress.DummyProgressBar())
new_branch = _mod_branch.Branch.open(self.get_url('branch'))
self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
self.assertEqual('CD', new_branch.last_revision())
@@ -183,7 +183,7 @@
branch2 = self.make_branch('branch2', format='knit')
converter = branch2.bzrdir._format.get_converter(target)
- converter.convert(branch2.bzrdir, progress.DummyProgress())
+ converter.convert(branch2.bzrdir, progress.DummyProgressBar())
branch2 = _mod_branch.Branch.open(self.get_url('branch'))
self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
@@ -192,7 +192,7 @@
tree = self.make_branch_and_tree('tree', format='knit')
target = bzrdir.format_registry.make_bzrdir('dirstate')
converter = tree.bzrdir._format.get_converter(target)
- converter.convert(tree.bzrdir, progress.DummyProgress())
+ converter.convert(tree.bzrdir, progress.DummyProgressBar())
new_tree = workingtree.WorkingTree.open('tree')
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
self.assertEqual(None, new_tree.last_revision())
@@ -205,7 +205,7 @@
tree.add(['file'], ['file-id'])
target = bzrdir.format_registry.make_bzrdir('dirstate')
converter = tree.bzrdir._format.get_converter(target)
- converter.convert(tree.bzrdir, progress.DummyProgress())
+ converter.convert(tree.bzrdir, progress.DummyProgressBar())
new_tree = workingtree.WorkingTree.open('tree')
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
self.assertEqual(None, new_tree.last_revision())
@@ -216,7 +216,7 @@
rev_id = tree.commit('first post')
target = bzrdir.format_registry.make_bzrdir('dirstate')
converter = tree.bzrdir._format.get_converter(target)
- converter.convert(tree.bzrdir, progress.DummyProgress())
+ converter.convert(tree.bzrdir, progress.DummyProgressBar())
new_tree = workingtree.WorkingTree.open('tree')
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
self.assertEqual(rev_id, new_tree.last_revision())
@@ -233,7 +233,7 @@
tree.merge_from_branch(merge_tree.branch)
target = bzrdir.format_registry.make_bzrdir('dirstate')
converter = tree.bzrdir._format.get_converter(target)
- converter.convert(tree.bzrdir, progress.DummyProgress())
+ converter.convert(tree.bzrdir, progress.DummyProgressBar())
new_tree = workingtree.WorkingTree.open('tree')
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
self.assertEqual(rev_id2, new_tree.last_revision())
=== modified file 'bzrlib/tests/test_versionedfile.py'
--- a/bzrlib/tests/test_versionedfile.py 2007-06-17 17:07:04 +0000
+++ b/bzrlib/tests/test_versionedfile.py 2007-07-11 07:00:40 +0000
@@ -566,11 +566,11 @@
# the ordering here is to make a tree so that dumb searches have
# more changes to muck up.
- class InstrumentedProgress(progress.DummyProgress):
+ class InstrumentedProgress(progress.DummyProgressBar):
def __init__(self):
- progress.DummyProgress.__init__(self)
+ progress.DummyProgressBar.__init__(self)
self.updates = []
def update(self, msg=None, current=None, total=None):
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2007-06-06 04:10:17 +0000
+++ b/bzrlib/transform.py 2007-07-11 07:00:40 +0000
@@ -33,7 +33,7 @@
from bzrlib.inventory import InventoryEntry
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
delete_any)
-from bzrlib.progress import DummyProgress, ProgressPhase
+from bzrlib.progress import DummyProgressBar, ProgressPhase
from bzrlib.symbol_versioning import deprecated_function, zero_fifteen
from bzrlib.trace import mutter, warning
from bzrlib import tree
@@ -86,7 +86,7 @@
* version_file
* set_executability
"""
- def __init__(self, tree, pb=DummyProgress()):
+ def __init__(self, tree, pb=DummyProgressBar()):
"""Note: a tree_write lock is taken on the tree.
Use TreeTransform.finalize() to release the lock (can be omitted if
@@ -1502,7 +1502,7 @@
def revert(working_tree, target_tree, filenames, backups=False,
- pb=DummyProgress(), change_reporter=None):
+ pb=DummyProgressBar(), change_reporter=None):
"""Revert a working tree's contents to those of a target tree."""
target_tree.lock_read()
tt = TreeTransform(working_tree, pb)
@@ -1628,7 +1628,7 @@
return merge_modified
-def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
+def resolve_conflicts(tt, pb=DummyProgressBar(), pass_func=None):
"""Make many conflict-resolution attempts, but die if they fail"""
if pass_func is None:
pass_func = conflict_pass
=== modified file 'bzrlib/ui/__init__.py'
--- a/bzrlib/ui/__init__.py 2007-04-26 20:52:43 +0000
+++ b/bzrlib/ui/__init__.py 2007-07-11 07:00:40 +0000
@@ -164,7 +164,7 @@
@deprecated_method(zero_eight)
def progress_bar(self):
"""See UIFactory.nested_progress_bar()."""
- return progress.DummyProgress()
+ return progress.DummyProgressBar()
def get_password(self, prompt='', **kwargs):
return None
@@ -172,7 +172,7 @@
def nested_progress_bar(self):
if self._progress_bar_stack is None:
self._progress_bar_stack = progress.ProgressBarStack(
- klass=progress.DummyProgress)
+ klass=progress.DummyProgressBar)
return self._progress_bar_stack.get_nested()
def clear_term(self):
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2007-07-04 08:08:08 +0000
+++ b/bzrlib/workingtree.py 2007-07-11 07:00:40 +0000
@@ -103,7 +103,7 @@
)
from bzrlib.trace import mutter, note
from bzrlib.transport.local import LocalTransport
-from bzrlib.progress import DummyProgress, ProgressPhase
+from bzrlib.progress import DummyProgressBar, ProgressPhase
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
from bzrlib.rio import RioReader, rio_file, Stanza
from bzrlib.symbol_versioning import (deprecated_passed,
@@ -1857,7 +1857,7 @@
@needs_tree_write_lock
def revert(self, filenames, old_tree=None, backups=True,
- pb=DummyProgress(), report_changes=False):
+ pb=DummyProgressBar(), report_changes=False):
from bzrlib.conflicts import resolve
if old_tree is None:
old_tree = self.basis_tree()
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-06-06 06:11:58 +0000
+++ b/bzrlib/workingtree_4.py 2007-07-11 07:00:40 +0000
@@ -84,7 +84,7 @@
from bzrlib.trace import mutter, note
from bzrlib.transport.local import LocalTransport
from bzrlib.tree import InterTree
-from bzrlib.progress import DummyProgress, ProgressPhase
+from bzrlib.progress import DummyProgressBar, ProgressPhase
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
from bzrlib.rio import RioReader, rio_file, Stanza
from bzrlib.symbol_versioning import (deprecated_passed,
More information about the bazaar-commits
mailing list