Rev 352: Don't prepend branch path with slash as that causes problems with in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

------------------------------------------------------------
revno: 352
revision-id: jelmer at samba.org-20070101162635-5cdtbm36kfqlhtcg
parent: jelmer at samba.org-20070101160712-hwasoj85vlmrxqmu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 17:26:35 +0100
message:
  Don't prepend branch path with slash as that causes problems with 
  svn_ra_dav connections.
modified:
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'TODO'
--- a/TODO	2007-01-01 16:07:12 +0000
+++ b/TODO	2007-01-01 16:26:35 +0000
@@ -1,4 +1,4 @@
-- shouldn't consider files for branches
+- handle parent directories of branches being moved correctly
 - allow remote locations in svn-import
 - fix "bzr status" in checkouts
 - faster "bzr status" in checkouts

=== modified file 'convert.py'
--- a/convert.py	2007-01-01 16:07:12 +0000
+++ b/convert.py	2007-01-01 16:26:35 +0000
@@ -98,7 +98,7 @@
         try:
             i = 0
             for (branch, revnum, exists) in existing_branches:
-                if source_repos.transport.check_path("/"+branch, revnum) == svn.core.svn_node_file:
+                if source_repos.transport.check_path(branch, revnum) == svn.core.svn_node_file:
                     continue
                 pb.update("%s:%d" % (branch, revnum), i, len(existing_branches))
                 revid = source_repos.generate_revision_id(revnum, branch)

=== modified file 'transport.py'
--- a/transport.py	2006-12-31 20:03:11 +0000
+++ b/transport.py	2007-01-01 16:26:35 +0000
@@ -208,6 +208,7 @@
 
     @need_lock
     def check_path(self, path, revnum, *args, **kwargs):
+        assert len(path) == 0 or path[0] != "/"
         mutter("svn check_path -r%d %s" % (revnum, path))
         return svn.ra.check_path(self._ra, path, revnum, *args, **kwargs)