Rev 1961: merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1961
revision-id: jelmer at samba.org-20081108155846-dx9upvxrlrddd2yk
parent: jelmer at samba.org-20081108143115-n4ehrzyo2s5tlf9d
parent: jelmer at samba.org-20081108141622-47okgpcnc91y9vk0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2008-11-08 16:58:46 +0100
message:
  merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
    ------------------------------------------------------------
    revno: 1669.9.1
    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-08 14:31:15 +0000
+++ b/NEWS	2008-11-08 15:58:46 +0000
@@ -62,7 +62,13 @@
 
 bzr-svn 0.4.15	UNRELEASED
 
-   * Ignore tags that happen to be files. (#294283)
+  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
 

=== modified file 'commit.py'
--- a/commit.py	2008-11-08 14:31:15 +0000
+++ b/commit.py	2008-11-08 15:58:46 +0000
@@ -37,6 +37,8 @@
 from bzrlib.plugins.svn.mapping import mapping_registry
 from bzrlib.plugins.svn.repository import SvnRepositoryFormat, SvnRepository
 from bzrlib.plugins.svn.versionedfiles import SvnTexts
+from bzrlib.plugins.svn.transport import _url_escape_uri
+
 
 def _revision_id_to_svk_feature(revid):
     """Create a SVK feature identifier from a revision id.
@@ -203,7 +205,7 @@
                               new_child_path)
             child_editor = dir_editor.add_file(
                     full_new_child_path, 
-                urlutils.join(base_url, old_inv.id2path(child_ie.file_id)),
+                _url_escape_uri(urlutils.join(base_url, old_inv.id2path(child_ie.file_id))),
                 base_revnum)
 
         # open if they existed at the same location
@@ -269,7 +271,7 @@
             mutter('copy dir %r -> %r', old_child_path, new_child_path)
             child_editor = dir_editor.add_directory(
                 branch_relative_path(new_child_path),
-                urlutils.join(base_url, old_child_path), base_revnum)
+                _url_escape_uri(urlutils.join(base_url, old_child_path)), base_revnum)
 
         # open if they existed at the same location and 
         # the directory was touched
@@ -726,7 +728,8 @@
             root = ci.open_root()
             if deletefirst:
                 root.delete_entry(urlutils.basename(branch_path))
-            branch_dir = root.add_directory(urlutils.basename(branch_path), urlutils.join(repository.base, revmeta.branch_path), revmeta.revnum)
+            branch_dir = root.add_directory(urlutils.basename(branch_path), 
+                    _url_escape_uri(urlutils.join(repository.base, revmeta.branch_path)), revmeta.revnum)
             for k, v in properties.diff(fileprops, revmeta.get_fileprops()).items():
                 branch_dir.change_prop(k, v)
             branch_dir.close()
@@ -967,7 +970,7 @@
 
                 (bp, _, _) = self.target.lookup_revision_id(parent_revid)
                 if target_branch is None:
-                    target_branch = Branch.open(urlutils.join(self.target.base, bp))
+                    target_branch = Branch.open(_url_escape_uri(urlutils.join(self.target.base, bp)))
                 if target_branch.get_branch_path() != bp:
                     target_branch.set_branch_path(bp)