Rev 5066: (vila for EdB) More builtin command UIFactory updates in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Mar 1 17:23:29 GMT 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5066 [merge]
revision-id: pqm at pqm.ubuntu.com-20100301172327-vlh6l9u4modihkau
parent: pqm at pqm.ubuntu.com-20100301095853-c1ffluypw71hgtgc
parent: v.ladeuil+lp at free.fr-20100301161843-sxbpwzvcxlzk8zah
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-03-01 17:23:27 +0000
message:
(vila for EdB) More builtin command UIFactory updates
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2010-02-23 07:43:11 +0000
+++ b/bzrlib/builtins.py 2010-03-01 16:18:43 +0000
@@ -2684,7 +2684,7 @@
if old_default_rules is not None:
# dump the rules and exit
for pattern in ignores.OLD_DEFAULTS:
- print pattern
+ self.outf.write("%s\n" % pattern)
return
if not name_pattern_list:
raise errors.BzrCommandError("ignore requires at least one "
@@ -2706,13 +2706,13 @@
if id is not None:
filename = entry[0]
if ignored.match(filename):
- matches.append(filename.encode('utf-8'))
+ matches.append(filename)
tree.unlock()
if len(matches) > 0:
- print "Warning: the following files are version controlled and" \
- " match your ignore pattern:\n%s" \
- "\nThese files will continue to be version controlled" \
- " unless you 'bzr remove' them." % ("\n".join(matches),)
+ self.outf.write("Warning: the following files are version controlled and"
+ " match your ignore pattern:\n%s"
+ "\nThese files will continue to be version controlled"
+ " unless you 'bzr remove' them.\n" % ("\n".join(matches),))
class cmd_ignored(Command):
@@ -2756,9 +2756,10 @@
try:
revno = int(revno)
except ValueError:
- raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
-
- print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
+ raise errors.BzrCommandError("not a valid revision-number: %r"
+ % revno)
+ revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
+ self.outf.write("%s\n" % revid)
class cmd_export(Command):
@@ -2911,7 +2912,7 @@
hidden = True
@display_command
def run(self):
- print osutils.local_time_offset()
+ self.outf.write("%s\n" % osutils.local_time_offset())
@@ -3339,7 +3340,7 @@
@display_command
def printme(self, branch):
- print branch.nick
+ self.outf.write('%s\n' % branch.nick)
class cmd_alias(Command):
@@ -3619,7 +3620,7 @@
@display_command
def run(self):
- print "It sure does!"
+ self.outf.write("It sure does!\n")
class cmd_find_merge_base(Command):
@@ -3645,7 +3646,7 @@
graph = branch1.repository.get_graph(branch2.repository)
base_rev_id = graph.find_unique_lca(last1, last2)
- print 'merge base is revision %s' % base_rev_id
+ self.outf.write('merge base is revision %s\n' % base_rev_id)
class cmd_merge(Command):
@@ -4444,11 +4445,11 @@
doc = '(no description)'
result.append((name_ver, doc, plugin.path()))
for name_ver, doc, path in sorted(result):
- print name_ver
- print ' ', doc
+ self.outf.write("%s\n" % name_ver)
+ self.outf.write(" %s\n" % doc)
if verbose:
- print ' ', path
- print
+ self.outf.write(" %s\n" % path)
+ self.outf.write("\n")
class cmd_testament(Command):
@@ -4734,12 +4735,11 @@
rev_id = b.get_rev_id(revno)
if rev_id is None or _mod_revision.is_null(rev_id):
- ui.ui_factory.note('No revisions to uncommit.')
+ self.outf.write('No revisions to uncommit.\n')
return 1
- log_collector = ui.ui_factory.make_output_stream()
lf = log_formatter('short',
- to_file=log_collector,
+ to_file=self.outf,
show_timezone='original')
show_log(b,
@@ -4750,21 +4750,22 @@
end_revision=last_revno)
if dry_run:
- ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
+ self.outf.write('Dry-run, pretending to remove'
+ ' the above revisions.\n')
else:
- ui.ui_factory.note('The above revision(s) will be removed.')
+ self.outf.write('The above revision(s) will be removed.\n')
if not force:
- if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
- ui.ui_factory.note('Canceled')
+ if not ui.ui_factory.get_boolean('Are you sure'):
+ self.outf.write('Canceled')
return 0
mutter('Uncommitting from {%s} to {%s}',
last_rev_id, rev_id)
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
revno=revno, local=local)
- ui.ui_factory.note('You can restore the old tip by running:\n'
- ' bzr pull . -r revid:%s' % last_rev_id)
+ self.outf.write('You can restore the old tip by running:\n'
+ ' bzr pull . -r revid:%s\n' % last_rev_id)
class cmd_break_lock(Command):
=== modified file 'bzrlib/tests/blackbox/test_nick.py'
--- a/bzrlib/tests/blackbox/test_nick.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_nick.py 2010-03-01 16:17:57 +0000
@@ -30,11 +30,11 @@
self.make_branch_and_tree('me.dev')
os.chdir('me.dev')
nick = self.run_bzr('nick')[0]
- self.assertEqual(nick, 'me.dev\n')
+ self.assertEqual('me.dev\n', nick)
# set the nickname
self.run_bzr("nick moo")
nick = self.run_bzr('nick')[0]
- self.assertEqual(nick, 'moo\n')
+ self.assertEqual('moo\n', nick)
def test_autonick_urlencoded(self):
# https://bugs.launchpad.net/bzr/+bug/66857 -- nick was printed
@@ -42,30 +42,30 @@
self.make_branch_and_tree('!repo')
os.chdir('!repo')
nick = self.run_bzr('nick')[0]
- self.assertEqual(nick, '!repo\n')
+ self.assertEqual('!repo\n', nick)
def test_bound_nick(self):
"""Check that nick works well for checkouts."""
base = self.make_branch_and_tree('base')
child = self.make_branch_and_tree('child')
os.chdir('child')
- self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')
- self.assertEqual(child.branch.get_config().has_explicit_nickname(),
- False)
+ self.assertEqual('child', self.run_bzr('nick')[0][:-1])
+ self.assertEqual(False,
+ child.branch.get_config().has_explicit_nickname())
self.run_bzr('bind ../base')
- self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
- self.assertEqual(child.branch.get_config().has_explicit_nickname(),
- False)
+ self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
+ self.assertEqual(False,
+ child.branch.get_config().has_explicit_nickname())
self.run_bzr('unbind')
self.run_bzr("nick explicit_nick")
- self.assertEqual(self.run_bzr('nick')[0][:-1], "explicit_nick")
- self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
- "explicit_nick")
+ self.assertEqual("explicit_nick", self.run_bzr('nick')[0][:-1])
+ self.assertEqual("explicit_nick",
+ child.branch.get_config()._get_explicit_nickname())
self.run_bzr('bind ../base')
- self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
- self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
- base.branch.nick)
+ self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
+ self.assertEqual(base.branch.nick,
+ child.branch.get_config()._get_explicit_nickname())
def test_boundless_nick(self):
"""Nick defaults to implicit local nick when bound branch is AWOL"""
@@ -73,8 +73,8 @@
child = self.make_branch_and_tree('child')
os.chdir('child')
self.run_bzr('bind ../base')
- self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
- self.assertEqual(child.branch.get_config().has_explicit_nickname(),
- False)
+ self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
+ self.assertEqual(False,
+ child.branch.get_config().has_explicit_nickname())
osutils.rmtree('../base')
- self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')
+ self.assertEqual('child', self.run_bzr('nick')[0][:-1])
=== modified file 'bzrlib/tests/blackbox/test_uncommit.py'
--- a/bzrlib/tests/blackbox/test_uncommit.py 2010-02-10 17:52:08 +0000
+++ b/bzrlib/tests/blackbox/test_uncommit.py 2010-03-01 16:18:43 +0000
@@ -216,7 +216,7 @@
def test_uncommit_shows_log_with_revision_id(self):
wt = self.create_simple_tree()
-
+
script = ScriptRunner()
script.run_script(self, """
$ cd tree
More information about the bazaar-commits
mailing list