Merge lp:~jelmer/bzr/co-directory-service into lp:bzr

[Jelmer Vernooij]

Add co: directory service.

Add the 'co:' directory service.

This allows addressing colocated branches with a somewhat easier syntax,
instead of the frustratingly long "file:.,branch=NAME".

[Vincent Ladeuil (vila)]

What's new worthy !

Could you make 'co:' appear in some 'bzr help' output ?

review: Needs Fixing

=== modified file 'bzrlib/directory_service.py'
--- bzrlib/directory_service.py	2011-12-19 13:23:58 +0000
+++ bzrlib/directory_service.py	2012-03-21 13:34:24 +0000
@@ -30,6 +30,7 @@
 lazy_import(globals(), """
 from bzrlib import (
     branch as _mod_branch,
+    controldir as _mod_controldir,
     urlutils,
     )
 """)
@@ -131,3 +132,21 @@
 
 directories.register(':', AliasDirectory,
                      'Easy access to remembered branch locations')
+
+
+class ColocatedDirectory(object):
+    """Directory lookup for colocated branches.
+
+    co:somename will resolve to the colocated branch with "somename" in
+    the current directory.
+    """
+
+    def look_up(self, name, url):
+        dir = _mod_controldir.ControlDir.open_containing('.')[0]
+        return urlutils.join_segment_parameters(dir.user_url,
+            {"branch": urlutils.escape(name)})
+
+
+directories.register('co:', ColocatedDirectory,
+                     'Easy access to colocated branches')
+
 
=== modified file 'bzrlib/tests/test_directory_service.py'
--- bzrlib/tests/test_directory_service.py	2012-01-18 14:09:19 +0000
+++ bzrlib/tests/test_directory_service.py	2012-03-21 13:34:24 +0000
@@ -116,3 +116,24 @@
         AliasDirectory.branch_aliases.register("booga",
             lambda b: "UHH?", help="Nobody knows")
         self.assertEquals("UHH?", directories.dereference(":booga"))
+
+
+class TestColocatedDirectory(TestCaseWithTransport):
+
+    def test_lookup_non_default(self):
+        default = self.make_branch('.')
+        non_default = default.bzrdir.create_branch(name='nondefault')
+        self.assertEquals(non_default.base, directories.dereference('co:nondefault'))
+
+    def test_lookup_default(self):
+        default = self.make_branch('.')
+        non_default = default.bzrdir.create_branch(name='nondefault')
+        self.assertEquals(urlutils.join_segment_parameters(default.bzrdir.user_url,
+            {"branch": ""}), directories.dereference('co:'))
+
+    def test_no_such_branch(self):
+        # No error is raised in this case, that is up to the code that actually
+        # opens the branch.
+        default = self.make_branch('.')
+        self.assertEquals(urlutils.join_segment_parameters(default.bzrdir.user_url,
+            {"branch": "foo"}), directories.dereference('co:foo'))
 
=== modified file 'bzrlib/tests/test_mergetools.py'
--- bzrlib/tests/test_mergetools.py	2012-02-28 04:58:14 +0000
+++ bzrlib/tests/test_mergetools.py	2012-03-21 13:34:24 +0000
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import os
-import re
 import sys
 import tempfile
 
@@ -23,7 +22,6 @@
     mergetools,
     tests
 )
-from bzrlib.tests.features import backslashdir_feature
 
 
 class TestFilenameSubstitution(tests.TestCaseInTempDir):
@@ -39,7 +37,7 @@
              '-o',
              'test.txt'],
             args)
-        
+
     def test_spaces(self):
         cmd_list = ['kdiff3', '{base}', '{this}', '{other}', '-o', '{result}']
         args, tmpfile = mergetools._subst_filename(cmd_list,
@@ -107,7 +105,7 @@
             ('test.txt.THIS', 'this stuff'),
             ('test.txt.OTHER', 'other stuff'),
         ))
-        
+
     def test_invoke_expands_exe_path(self):
         self.overrideEnv('PATH', os.path.dirname(sys.executable))
         def dummy_invoker(exe, args, cleanup):
@@ -120,7 +118,7 @@
         self.assertEqual(0, retcode)
         self.assertEqual(sys.executable, self._exe)
         self.assertEqual(['test.txt'], self._args)
-        
+
     def test_success(self):
         def dummy_invoker(exe, args, cleanup):
             self._exe = exe
@@ -131,7 +129,7 @@
         self.assertEqual(0, retcode)
         self.assertEqual('tool', self._exe)
         self.assertEqual(['test.txt'], self._args)
-    
+
     def test_failure(self):
         def dummy_invoker(exe, args, cleanup):
             self._exe = exe
@@ -159,7 +157,7 @@
         self.assertEqual('tool', self._exe)
         self.assertPathDoesNotExist(self._args[0])
         self.assertFileEqual('temp stuff', 'test.txt')
-    
+
     def test_failure_tempfile(self):
         def dummy_invoker(exe, args, cleanup):
             self._exe = exe
 
=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- doc/en/release-notes/bzr-2.6.txt	2012-03-16 15:05:05 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2012-03-21 13:34:24 +0000
@@ -26,6 +26,9 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
+* Colocated branches can now be addressed using the 'co:NAME' rather than
+  the more complex 'file://.,branch=NAME'. (Jelmer Vernooij, #833665)
+
 Bug Fixes
 *********