Rev 2983: (Daniel Watkins) improve the message when recommending 'move --after', (bug #85237) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Nov 13 18:39:35 GMT 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2983
revision-id: pqm at pqm.ubuntu.com-20071113183931-av8ih92ad65slodl
parent: pqm at pqm.ubuntu.com-20071113174849-2zsajpakcs8uy1bo
parent: d.m.watkins at warwick.ac.uk-20071113021022-1u3x2k4q4kh1pxh5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-11-13 18:39:31 +0000
message:
(Daniel Watkins) improve the message when recommending 'move --after', (bug #85237)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2967.3.7
merged: d.m.watkins at warwick.ac.uk-20071113021022-1u3x2k4q4kh1pxh5
parent: d.m.watkins at warwick.ac.uk-20071113020903-ekqzrah1rtfy6cll
parent: pqm at pqm.ubuntu.com-20071113005140-mp4owdlrd1ccnqc9
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 85237
timestamp: Tue 2007-11-13 02:10:22 +0000
message:
Merged bzr.dev and moved NEWS item to appropriate location.
------------------------------------------------------------
revno: 2967.3.6
merged: d.m.watkins at warwick.ac.uk-20071113020903-ekqzrah1rtfy6cll
parent: d.m.watkins at warwick.ac.uk-20071109105810-vylc4n6abjf1i4da
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 85237
timestamp: Tue 2007-11-13 02:09:03 +0000
message:
Extracted the string from every use of RenameFailedFilesExist to RenameFailedFilesExist itself.
------------------------------------------------------------
revno: 2967.3.5
merged: d.m.watkins at warwick.ac.uk-20071109105810-vylc4n6abjf1i4da
parent: d.m.watkins at warwick.ac.uk-20071106135043-cz8810pvlwiwphx5
parent: pqm at pqm.ubuntu.com-20071109031316-n814a39wmtxvybyw
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 85237
timestamp: Fri 2007-11-09 10:58:10 +0000
message:
Merged bzr.dev.
------------------------------------------------------------
revno: 2967.3.4
merged: d.m.watkins at warwick.ac.uk-20071106135043-cz8810pvlwiwphx5
parent: d.m.watkins at warwick.ac.uk-20071106111850-zi8uoqnpf4llnnni
parent: pqm at pqm.ubuntu.com-20071106124804-ehlreba0lfp3kab9
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 85237
timestamp: Tue 2007-11-06 13:50:43 +0000
message:
Merged bzr.dev and moved NEWS item to appropriate location.
------------------------------------------------------------
revno: 2967.3.3
merged: d.m.watkins at warwick.ac.uk-20071106111850-zi8uoqnpf4llnnni
parent: d.m.watkins at warwick.ac.uk-20071106043338-3fnuxrahierktzq0
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 85237
timestamp: Tue 2007-11-06 11:18:50 +0000
message:
Added NEWS item.
------------------------------------------------------------
revno: 2967.3.2
merged: d.m.watkins at warwick.ac.uk-20071106043338-3fnuxrahierktzq0
parent: d.m.watkins at warwick.ac.uk-20071106043057-2xk31p0kn48nb6bn
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 85237
timestamp: Tue 2007-11-06 04:33:38 +0000
message:
Modified tests to reflect modified error messages.
------------------------------------------------------------
revno: 2967.3.1
merged: d.m.watkins at warwick.ac.uk-20071106043057-2xk31p0kn48nb6bn
parent: pqm at pqm.ubuntu.com-20071105211156-bwx6vf8f88m247cy
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 85237
timestamp: Tue 2007-11-06 04:30:57 +0000
message:
Modified error messages.
=== modified file 'NEWS'
--- a/NEWS 2007-11-13 00:51:40 +0000
+++ b/NEWS 2007-11-13 02:10:22 +0000
@@ -63,6 +63,9 @@
* Reconcile now shows progress bars. (Robert Collins, #159351)
+ * The error message when ``move --after`` should be used makes how to do so
+ clearer. (Daniel Watkins, #85237)
+
* Unicode-safe output from ``bzr info``. The output will be encoded
using the terminal encoding and unrepresentable characters will be
replaced by '?'. (Lukáš Lalinský, #151844)
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2007-10-31 12:40:19 +0000
+++ b/bzrlib/errors.py 2007-11-13 02:09:03 +0000
@@ -470,7 +470,8 @@
"""Used when renaming and both source and dest exist."""
_fmt = ("Could not rename %(source)s => %(dest)s because both files exist."
- "%(extra)s")
+ " (Use --after to tell bzr about a rename that has already"
+ " happened)%(extra)s")
def __init__(self, source, dest, extra=None):
BzrError.__init__(self)
=== modified file 'bzrlib/tests/blackbox/test_mv.py'
--- a/bzrlib/tests/blackbox/test_mv.py 2007-11-01 09:52:45 +0000
+++ b/bzrlib/tests/blackbox/test_mv.py 2007-11-06 04:33:38 +0000
@@ -272,7 +272,8 @@
self.build_tree(['a']) #touch a
self.run_bzr_error(
["^bzr: ERROR: Could not rename a => b because both files exist."
- " \(Use --after to update the Bazaar id\)$"],
+ " \(Use --after to tell bzr about a rename that has already"
+ " happened\)$"],
'mv a b')
self.failUnlessExists('a')
self.failUnlessExists('b')
@@ -320,8 +321,9 @@
self.build_tree(['a2']) #touch a2
self.run_bzr_error(
- ["^bzr: ERROR: Could not rename a1 => sub/a1 because both files exist."
- " \(Use --after to update the Bazaar id\)$"],
+ ["^bzr: ERROR: Could not rename a1 => sub/a1 because both files"
+ " exist. \(Use --after to tell bzr about a rename that has already"
+ " happened\)$"],
'mv a1 a2 sub')
self.failUnlessExists('a1')
self.failUnlessExists('a2')
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2007-11-13 17:48:49 +0000
+++ b/bzrlib/workingtree.py 2007-11-13 18:39:31 +0000
@@ -1326,8 +1326,7 @@
errors.PathsDoNotExist(paths=(str(from_rel),
str(to_rel))))
else:
- raise errors.RenameFailedFilesExist(from_rel, to_rel,
- extra="(Use --after to update the Bazaar id)")
+ raise errors.RenameFailedFilesExist(from_rel, to_rel)
rename_entry.only_change_inv = only_change_inv
return rename_entries
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-11-05 19:40:28 +0000
+++ b/bzrlib/workingtree_4.py 2007-11-13 02:09:03 +0000
@@ -720,8 +720,7 @@
if from_missing: # implicitly just update our path mapping
move_file = False
elif not after:
- raise errors.RenameFailedFilesExist(from_rel, to_rel,
- extra="(Use --after to update the Bazaar id)")
+ raise errors.RenameFailedFilesExist(from_rel, to_rel)
rollbacks = []
def rollback_rename():
More information about the bazaar-commits
mailing list