Merge lp:~jelmer/bzr-upload/only-strip-slash into lp:bzr-upload

[Jelmer Vernooij]

In a test, only remove the last character from a branch base if it is a slash.

This fixes running the bzr-upload testsuite when run against bzr-svn.

[Martin Packman (gz)]

Only stripping trailing slashes is clearly an improvement on always removing whatever the last character is and this should clearly land.

However, doing url manipulation with basic string functions, even simple stuff like this, makes me nervous. I'm thinking particularly of this change:

<https://code.launchpad.net/~gz/bzr/root_drive_file_url_841322/+merge/74034>

         self.base = base
- self._segment_parameters = urlutils.split_segment_parameters(
- base.rstrip("/"))[1]
+ self._segment_parameters = urlutils.split_segment_parameters(base)[1]

Which was needed to avoid some very surprising breakage.

review: Approve

[Martin Pool (mbp)]

  vote approve
  review approve

review: Approve

=== modified file 'tests/test_upload.py'
--- tests/test_upload.py	2011-07-09 11:13:45 +0000
+++ tests/test_upload.py	2011-10-21 22:40:29 +0000
@@ -756,7 +756,7 @@
         b = self.get_branch()
         open(fn, 'wt').write(("[%s]\n"
                                   "upload_location=foo\n" %
-                                  b.base[:-1]))
+                                  b.base.rstrip("/")))
         conf = b.get_config()
         self.assertEqual("foo", conf.get_user_option('upload_location'))