Merge lp:~maxb/bzr-svn/wildcard-layout-no-project-path into lp:bzr-svn/1.0

[Max Bowsher]

To the best of my understanding, "project" in bzr-svn layout terminology is a sub-path of a Subversion repository which contains all the branches and tags for the conceptual project that the branch currently being operated on is part of.

If I've got that right, it's clearly wrong for WildcardLayout to set the project path to be the same as the branch path. Setting it to "" is a nice safe default, if potentially causing unnecessary work to be done.

I came across this because if the current WildcardLayout is used on a svn repository containing a branch that has been removed in the HEAD revision, a crash can occur because RevisionMetadataProvider.iter_all_changes passes an empty list of prefixes to RevisionMetadataBrowser.

[Jelmer Vernooij (jelmer)]

On Wed, 2011-01-12 at 00:25 +0000, Max Bowsher wrote:
> Max Bowsher has proposed merging lp:~maxb/bzr-svn/wildcard-layout-no-project-path into lp:bzr-svn.
>
> Requested reviews:
> bzr-svn developers (bzr-svn)
>
> For more details, see:
> https://code.launchpad.net/~maxb/bzr-svn/wildcard-layout-no-project-path/+merge/45942
>
> To the best of my understanding, "project" in bzr-svn layout
> terminology is a sub-path of a Subversion repository which contains all
> the branches and tags for the conceptual project that the branch
> currently being operated on is part of.
Project is a unique identifier for a particular project that can be
found in the repository.

Sharing the project identifier between multiple branches/tags means that
they will share each others tags.

Using the same project identifier is probably not a good idea for
wildcardlayout, because it means the tags will get polluted with
unrelated branches.

  review needsfixing

review: Needs Fixing

Unmerged revisions

3496. By Max Bowsher on 2011-01-11

WildcardLayout should not set project path.

3495. By Jelmer Vernooij on 2010-12-29

Support `old_tip` argument to WorkingTree.update().

3494. By Jelmer Vernooij on 2010-12-29

Add support for old_tip in WorkingTree.update().

3493. By Jelmer Vernooij on 2010-12-29

Support revision argument to update.

3492. By Jelmer Vernooij on 2010-12-26

Support layouts that don't provide certain functions.

3491. By Jelmer Vernooij on 2010-11-24

Fix version check.

3490. By Jelmer Vernooij on 2010-11-24

Mention API version in error rather than run time version, if possible.

3489. By Jelmer Vernooij on 2010-11-24

mention subversion API version in mutter.

3488. By Jelmer Vernooij on 2010-11-15

use a timeout of 20 seconds when waiting for sqlite locks.

3487. By Jelmer Vernooij on 2010-11-14

'support' diffing binary files.

=== modified file 'layout/standard.py'
--- layout/standard.py	2010-08-09 21:14:32 +0000
+++ layout/standard.py	2011-01-12 00:24:57 +0000
@@ -399,9 +399,9 @@
         for i in range(len(parts)+1):
             bp = "/".join(parts[:i])
             if self.is_branch(bp):
-                return ("branch", bp, bp, path[len(bp):].strip("/"))
+                return ("branch", "", bp, path[len(bp):].strip("/"))
             if self.is_tag(bp):
-                return ("tag", bp, bp, path[len(bp):].strip("/"))
+                return ("tag", "", bp, path[len(bp):].strip("/"))
 
         raise svn_errors.NotSvnBranchPath(path)