Rev 3990: (oddbloke) bzr add distinguishes between success and failure better. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Feb 9 21:08:14 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3990
revision-id: pqm at pqm.ubuntu.com-20090209210810-cq9lgqy519b7wfyi
parent: pqm at pqm.ubuntu.com-20090209183206-y863mmnx7mrjor7s
parent: aaron at aaronbentley.com-20090209202637-7krzt5zys9t4jimw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-02-09 21:08:10 +0000
message:
(oddbloke) bzr add distinguishes between success and failure better.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
------------------------------------------------------------
revno: 3989.1.2
revision-id: aaron at aaronbentley.com-20090209202637-7krzt5zys9t4jimw
parent: aaron at aaronbentley.com-20090209202429-ezb9kbsbipfudqe8
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.ab.integration
timestamp: Mon 2009-02-09 15:26:37 -0500
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3989.1.1
revision-id: aaron at aaronbentley.com-20090209202429-ezb9kbsbipfudqe8
parent: pqm at pqm.ubuntu.com-20090209183206-y863mmnx7mrjor7s
parent: daniel at daniel-watkins.co.uk-20090208142635-zyzycxxz7i6p3dih
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.ab.integration
timestamp: Mon 2009-02-09 15:24:29 -0500
message:
Merge add update from oddbloke
modified:
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
------------------------------------------------------------
revno: 3985.2.5
revision-id: daniel at daniel-watkins.co.uk-20090208142635-zyzycxxz7i6p3dih
parent: daniel at daniel-watkins.co.uk-20090208142108-2bjcon7ozr4u85jj
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 211139-add-partial-success
timestamp: Sun 2009-02-08 15:26:35 +0100
message:
Reverted some irrelevant changes.
modified:
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
------------------------------------------------------------
revno: 3985.2.4
revision-id: daniel at daniel-watkins.co.uk-20090208142108-2bjcon7ozr4u85jj
parent: daniel at daniel-watkins.co.uk-20090208141025-wc1lujgwbvq53nqv
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 211139-add-partial-success
timestamp: Sun 2009-02-08 15:21:08 +0100
message:
Fixed a test I missed.
modified:
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
------------------------------------------------------------
revno: 3985.2.3
revision-id: daniel at daniel-watkins.co.uk-20090208141025-wc1lujgwbvq53nqv
parent: daniel at daniel-watkins.co.uk-20090208140939-t2flfw3p6xaf67xh
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 211139-add-partial-success
timestamp: Sun 2009-02-08 15:10:25 +0100
message:
Changed output of add to not suggest partial success.
modified:
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3985.2.2
revision-id: daniel at daniel-watkins.co.uk-20090208140939-t2flfw3p6xaf67xh
parent: daniel at daniel-watkins.co.uk-20090208135428-h800ry18p4buguog
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 211139-add-partial-success
timestamp: Sun 2009-02-08 15:09:39 +0100
message:
Fix typos in tests.
modified:
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
------------------------------------------------------------
revno: 3985.2.1
revision-id: daniel at daniel-watkins.co.uk-20090208135428-h800ry18p4buguog
parent: pqm at pqm.ubuntu.com-20090208133308-rn4wcu897hduyl2d
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 211139-add-partial-success
timestamp: Sun 2009-02-08 14:54:28 +0100
message:
Updated tests for new behaviour.
modified:
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
=== modified file 'NEWS'
--- a/NEWS 2009-02-09 02:35:02 +0000
+++ b/NEWS 2009-02-09 20:26:37 +0000
@@ -48,6 +48,9 @@
IMPROVEMENTS:
+ * ``bzr add`` more clearly communicates success vs failure.
+ (Daniel Watkins)
+
* ``bzr init`` will now print a little less verbose output.
(Marius Kruger)
=== modified file 'bzrlib/add.py'
--- a/bzrlib/add.py 2008-05-02 07:31:24 +0000
+++ b/bzrlib/add.py 2009-02-08 14:10:25 +0000
@@ -54,7 +54,7 @@
:param kind: The kind of the object being added.
"""
if self.should_print:
- self._to_file.write('added %s\n' % _quote(path.raw_path))
+ self._to_file.write('adding %s\n' % _quote(path.raw_path))
return None
@@ -73,7 +73,7 @@
file_id, base_path = self._get_base_file_id(path, parent_ie)
if file_id is not None:
if self.should_print:
- self._to_file.write('added %s w/ file id from %s\n'
+ self._to_file.write('adding %s w/ file id from %s\n'
% (path.raw_path, base_path))
else:
# we aren't doing anything special, so let the default
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-02-02 05:43:13 +0000
+++ b/bzrlib/builtins.py 2009-02-08 14:10:25 +0000
@@ -525,6 +525,8 @@
finally:
if base_tree is not None:
base_tree.unlock()
+ if not is_quiet() and len(added) > 0:
+ self.outf.write('add completed\n')
if len(ignored) > 0:
if verbose:
for glob in sorted(ignored.keys()):
=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- a/bzrlib/tests/blackbox/test_add.py 2007-08-02 17:01:23 +0000
+++ b/bzrlib/tests/blackbox/test_add.py 2009-02-08 14:09:39 +0000
@@ -35,10 +35,11 @@
results = sorted(out.rstrip('\n').split('\n'))
self.assertEquals(['If you wish to add some of these files, please'\
' add them by name.',
- 'added .bzrignore',
- 'added dir',
- 'added dir/sub.txt',
- 'added top.txt',
+ 'add completed',
+ 'adding .bzrignore',
+ 'adding dir',
+ 'adding dir/sub.txt',
+ 'adding top.txt',
'ignored 1 file(s).'],
results)
out = self.run_bzr('add -v')[0]
@@ -146,9 +147,10 @@
os.chdir('new')
out, err = self.run_bzr('add --file-ids-from ../base')
self.assertEqual('', err)
- self.assertEqualDiff('added a w/ file id from a\n'
- 'added b w/ file id from b\n'
- 'added b/c w/ file id from b/c\n',
+ self.assertEqualDiff('adding a w/ file id from a\n'
+ 'adding b w/ file id from b\n'
+ 'adding b/c w/ file id from b/c\n'
+ 'add completed\n',
out)
new_tree = new_tree.bzrdir.open_workingtree()
self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
@@ -167,8 +169,9 @@
os.chdir('new')
out, err = self.run_bzr('add --file-ids-from ../base/b')
self.assertEqual('', err)
- self.assertEqualDiff('added c w/ file id from b/c\n'
- 'added d w/ file id from b/d\n',
+ self.assertEqualDiff('adding c w/ file id from b/c\n'
+ 'adding d w/ file id from b/d\n'
+ 'add completed\n',
out)
new_tree = new_tree.bzrdir.open_workingtree()
=== modified file 'bzrlib/tests/test_smart_add.py'
--- a/bzrlib/tests/test_smart_add.py 2007-07-04 08:46:22 +0000
+++ b/bzrlib/tests/test_smart_add.py 2009-02-08 14:26:35 +0000
@@ -150,7 +150,7 @@
self.run_action("")
def test__print(self):
- self.run_action("added path\n")
+ self.run_action("adding path\n")
def run_action(self, output):
from bzrlib.add import AddAction
More information about the bazaar-commits
mailing list