Rev 5574: (gz) Merge 2.2 to bzr.dev to pick up fixes for lp:686611 and lp:687653 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Dec 16 23:20:53 GMT 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5574 [merge]
revision-id: pqm at pqm.ubuntu.com-20101216232051-kv49ainzwdyjg92m
parent: pqm at pqm.ubuntu.com-20101216151517-qoslvcss5y1sivi6
parent: gzlist at googlemail.com-20101216204147-aquetqr5v8pilrzx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-12-16 23:20:51 +0000
message:
(gz) Merge 2.2 to bzr.dev to pick up fixes for lp:686611 and lp:687653
(Martin [gz])
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
doc/en/release-notes/bzr-2.0.txt bzr2.0.txt-20101008081016-21wd86gpfhllpue3-37
doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38
doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2010-11-06 10:55:58 +0000
+++ b/bzrlib/errors.py 2010-12-16 20:41:47 +0000
@@ -713,6 +713,9 @@
self.bzrdir = bzrdir
PathError.__init__(self, path=path)
+ def __repr__(self):
+ return '<%s %r>' % (self.__class__.__name__, self.__dict__)
+
def _format(self):
# XXX: Ideally self.detail would be a property, but Exceptions in
# Python 2.4 have to be old-style classes so properties don't work.
=== modified file 'bzrlib/mutabletree.py'
--- a/bzrlib/mutabletree.py 2010-10-17 23:20:40 +0000
+++ b/bzrlib/mutabletree.py 2010-12-16 20:41:47 +0000
@@ -418,7 +418,9 @@
# expand any symlinks in the directory part, while leaving the
# filename alone
- file_list = map(osutils.normalizepath, file_list)
+ # only expanding if symlinks are supported avoids windows path bugs
+ if osutils.has_symlinks():
+ file_list = map(osutils.normalizepath, file_list)
# validate user file paths and convert all paths to tree
# relative : it's cheaper to make a tree relative path an abspath
=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- a/bzrlib/tests/blackbox/test_add.py 2010-12-09 04:26:53 +0000
+++ b/bzrlib/tests/blackbox/test_add.py 2010-12-16 20:41:47 +0000
@@ -229,3 +229,12 @@
$ bzr add tree1/a tree2/b
2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
''')
+
+ def test_add_multiple_files_in_unicode_cwd(self):
+ """Adding multiple files in a non-ascii cwd, see lp:686611"""
+ self.requireFeature(tests.UnicodeFilename)
+ self.make_branch_and_tree(u"\xA7")
+ self.build_tree([u"\xA7/a", u"\xA7/b"])
+ out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
+ self.assertEquals(out, "adding a\n" "adding b\n")
+ self.assertEquals(err, "")
=== modified file 'doc/en/release-notes/bzr-2.0.txt'
--- a/doc/en/release-notes/bzr-2.0.txt 2010-12-02 10:43:55 +0000
+++ b/doc/en/release-notes/bzr-2.0.txt 2010-12-16 20:41:47 +0000
@@ -25,6 +25,9 @@
Bug Fixes
*********
+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
+ path on windows from symlink support addition. (Martin [gz], #686611)
+
Improvements
************
=== modified file 'doc/en/release-notes/bzr-2.1.txt'
--- a/doc/en/release-notes/bzr-2.1.txt 2010-12-16 06:24:14 +0000
+++ b/doc/en/release-notes/bzr-2.1.txt 2010-12-16 20:41:47 +0000
@@ -25,6 +25,9 @@
Bug Fixes
*********
+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
+ path on windows from symlink support addition. (Martin [gz], #686611)
+
* Skip tests that needs a bzr source tree when there isn't one. This is
needed to succesfully run the test suite for installed versions.
(Vincent Ladeuil, #644855).
=== modified file 'doc/en/release-notes/bzr-2.2.txt'
--- a/doc/en/release-notes/bzr-2.2.txt 2010-12-16 06:24:14 +0000
+++ b/doc/en/release-notes/bzr-2.2.txt 2010-12-16 20:41:47 +0000
@@ -25,6 +25,13 @@
Bug Fixes
*********
+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
+ path on windows from symlink support addition. (Martin [gz], #686611)
+
+* Don't probe for a repository from within ``NotBranchError.__repr__``,
+ because this can cause knock-on errors at awkward times.
+ (Andrew Bennetts, #687653)
+
Improvements
************
More information about the bazaar-commits
mailing list