Rev 5120: (mbp) avoid truncating svn urls in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5120 [merge]
revision-id: pqm at pqm.ubuntu.com-20100329063723-tbei64isc40zz7v8
parent: pqm at pqm.ubuntu.com-20100327103111-4g435d39ujhe95vp
parent: mbp at sourcefrog.net-20100329051420-1sh91w47n0ltkqai
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-03-29 07:37:23 +0100
message:
  (mbp) avoid truncating svn urls
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'NEWS'
--- a/NEWS	2010-03-27 09:52:10 +0000
+++ b/NEWS	2010-03-29 06:37:23 +0000
@@ -103,6 +103,9 @@
 * Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
   (Martin Pool, #331095)
 
+* Avoid truncating svn URLs.
+  (Martin Pool, Martin von Gagern, #545185)
+
 * ``bzr add`` will not add conflict related files unless explicitly required.
   (Vincent Ladeuil, #322767, #414589)
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-03-25 06:52:38 +0000
+++ b/bzrlib/builtins.py	2010-03-29 06:37:23 +0000
@@ -1428,8 +1428,9 @@
             branch_location = tree.branch.base
         self.add_cleanup(tree.unlock)
         # get rid of the final '/' and be ready for display
-        branch_location = urlutils.unescape_for_display(branch_location[:-1],
-                                                        self.outf.encoding)
+        branch_location = urlutils.unescape_for_display(
+            branch_location.rstrip('/'),
+            self.outf.encoding)
         existing_pending_merges = tree.get_parent_ids()[1:]
         if master is None:
             old_tip = None