Merge lp:~bialix/bzr-colo/repo-root into lp:bzr-colo

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

From log message: use colo: as pointer to real shared repo (.bzr/branches) root instead of assuming that repo root is '..'

This allows usage of branch names as 'foo/bar'.
The idea and code taken from repoalias plugin.

[Neil Martinsen-Burrell (nmb)]

Very Cool! Nice to be able to use multi-level branch names. This takes some more infrastructure in colo-branch to make it create parent directories under .bzr/branches.

=== modified file 'colocated.py'
--- colocated.py	2010-01-10 02:50:59 +0000
+++ colocated.py	2010-01-11 11:24:14 +0000
@@ -112,7 +112,8 @@
                 raise errors.InvalidURL(path=url,
                           extra="Can't look up a colocated branch name"
                                 " while not in a branch")
-            branch_location = urlutils.join(branch.base, '..', name)
+            branch_location = urlutils.join(
+                branch.repository.bzrdir.root_transport.base, name)
             if COLOCATED_LOCATION not in branch_location:
                 raise errors.InvalidURL(path=url,
                           extra="Not in a colocated workspace")