Rev 1734: Allow copying from files with spaces in their name over http. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1734
revision-id: jelmer at samba.org-20081108141622-47okgpcnc91y9vk0
parent: jelmer at samba.org-20081103141047-yngwlay84xy7xi2n
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 15:16:22 +0100
message:
  Allow copying from files with spaces in their name over http.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
=== modified file 'NEWS'
--- a/NEWS	2008-11-03 14:10:47 +0000
+++ b/NEWS	2008-11-08 14:16:22 +0000
@@ -1,5 +1,13 @@
 bzr-svn 0.4.15	UNRELEASED
 
+  BUG FIXES
+
+   * Fix compatibility with Bazaar 1.10.
+
+   * Ignore tags that happen to be files (another instance). (#290664)
+
+   * Support copying from files with spaces in their names over http. (#268304)
+
 bzr-svn 0.4.14	2008-11-03
 
   BUG FIXES

=== modified file 'commit.py'
--- a/commit.py	2008-11-03 02:12:28 +0000
+++ b/commit.py	2008-11-08 14:16:22 +0000
@@ -37,6 +37,7 @@
 from bzrlib.plugins.svn.logwalker import lazy_dict
 from bzrlib.plugins.svn.mapping import parse_revision_id
 from bzrlib.plugins.svn.repository import SvnRepositoryFormat, SvnRepository
+from bzrlib.plugins.svn.transport import _url_escape_uri
 
 
 def _revision_id_to_svk_feature(revid):
@@ -281,7 +282,7 @@
                                   new_child_path)
                 child_editor = dir_editor.add_file(
                         full_new_child_path, 
-                    urlutils.join(self.repository.transport.svn_url, self.base_path, self.old_inv.id2path(child_ie.file_id)),
+                    _url_escape_uri(urlutils.join(self.repository.transport.svn_url, self.base_path, self.old_inv.id2path(child_ie.file_id))),
                     self.base_revnum)
 
             # open if they existed at the same location
@@ -348,7 +349,7 @@
                 self.mutter('copy dir %r -> %r', old_child_path, new_child_path)
                 child_editor = dir_editor.add_directory(
                     urlutils.join(self.branch.get_branch_path(), new_child_path),
-                    urlutils.join(self.repository.transport.svn_url, self.base_path, old_child_path), self.base_revnum)
+                    _url_escape_uri(urlutils.join(self.repository.transport.svn_url, self.base_path, old_child_path), self.base_revnum))
 
             # open if they existed at the same location and 
             # the directory was touched
@@ -410,7 +411,7 @@
                 self.mutter("removing branch dir %r", name)
                 ret[-1].delete_entry(name, -1)
             if base_path is not None:
-                base_url = urlutils.join(self.repository.transport.svn_url, base_path)
+                base_url = _url_escape_uri(urlutils.join(self.repository.transport.svn_url, base_path))
             else:
                 base_url = None
             self.mutter("adding branch dir %r", name)