Merge lp:~jelmer/bzr/checkout-into-empty-control-dir into lp:bzr/2.5

[Jelmer Vernooij]

Allow creating a checkout in a directory that already has a control directory.

Allow creating a checkout in a directory that already has a control directory (of course, only as long as there is no existing checkout there).

This is useful for e.g. checking out a directory into a location where one or more colocated (but not active) branches already exist.

[Vincent Ladeuil (vila)]

Nicely tested !

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

[Jelmer Vernooij (jelmer)]

sent to pqm by email

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/branch.py'
--- bzrlib/branch.py	2012-01-18 17:47:06 +0000
+++ bzrlib/branch.py	2012-01-19 18:54:35 +0000
@@ -1457,18 +1457,35 @@
         t = transport.get_transport(to_location)
         t.ensure_base()
         format = self._get_checkout_format(lightweight=lightweight)
+        try:
+            checkout = format.initialize_on_transport(t)
+        except errors.AlreadyControlDirError:
+            # It's fine if the control directory already exists,
+            # as long as there is no existing branch and working tree.
+            checkout = controldir.ControlDir.open_from_transport(t)
+            try:
+                checkout.open_branch()
+            except errors.NotBranchError:
+                pass
+            else:
+                raise errors.AlreadyControlDirError(t.base)
+
         if lightweight:
+<<<<<<< TREE
             checkout = format.initialize_on_transport(t)
             from_branch = checkout.set_branch_reference(target_branch=self)
+=======
+            from_branch = checkout.set_branch_reference(target_branch=self)
+>>>>>>> MERGE-SOURCE
         else:
-            checkout_branch = controldir.ControlDir.create_branch_convenience(
-                to_location, force_new_tree=False, format=format)
-            checkout = checkout_branch.bzrdir
+            policy = checkout.determine_repository_policy()
+            repo = policy.acquire_repository()[0]
+            checkout_branch = checkout.create_branch()
             checkout_branch.bind(self)
             # pull up to the specified revision_id to set the initial
             # branch tip correctly, and seed it with history.
             checkout_branch.pull(self, stop_revision=revision_id)
-            from_branch=None
+            from_branch = None
         tree = checkout.create_workingtree(revision_id,
                                            from_branch=from_branch,
                                            accelerator_tree=accelerator_tree,

=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2012-01-18 17:46:57 +0000
+++ bzrlib/bzrdir.py	2012-01-19 18:54:35 +0000
@@ -1475,10 +1475,13 @@
         # mode from the root directory
         temp_control = lockable_files.LockableFiles(transport,
                             '', lockable_files.TransportLock)
-        temp_control._transport.mkdir('.bzr',
-                                      # FIXME: RBC 20060121 don't peek under
-                                      # the covers
-                                      mode=temp_control._dir_mode)
+        try:
+            temp_control._transport.mkdir('.bzr',
+                # FIXME: RBC 20060121 don't peek under
+                # the covers
+                mode=temp_control._dir_mode)
+        except errors.FileExists:
+            raise errors.AlreadyControlDirError(transport.base)
         if sys.platform == 'win32' and isinstance(transport, local.LocalTransport):
             win32utils.set_file_attr_hidden(transport._abspath('.bzr'))
         file_mode = temp_control._file_mode

=== modified file 'bzrlib/errors.py'
--- bzrlib/errors.py	2011-12-22 15:33:16 +0000
+++ bzrlib/errors.py	2012-01-19 18:54:35 +0000
@@ -700,6 +700,11 @@
        self.path = urlutils.unescape_for_display(branch.base, 'ascii')
 
 
+class AlreadyControlDirError(PathError):
+
+    _fmt = 'A control directory already exists: "%(path)s".'
+
+
 class AlreadyBranchError(PathError):
 
     _fmt = 'Already a branch: "%(path)s".'

=== modified file 'bzrlib/push.py'
--- bzrlib/push.py	2011-12-19 13:23:58 +0000
+++ bzrlib/push.py	2012-01-19 18:54:35 +0000
@@ -92,11 +92,11 @@
                 revision_id=revision_id, stacked_on=stacked_on,
                 create_prefix=create_prefix, use_existing_dir=use_existing_dir,
                 no_tree=no_tree)
+        except errors.AlreadyControlDirError, err:
+            raise errors.BzrCommandError(gettext(
+                "Target directory %s already contains a .bzr directory, "
+                "but it is not valid.") % (location,))
         except errors.FileExists, err:
-            if err.path.endswith('/.bzr'):
-                raise errors.BzrCommandError(gettext(
-                    "Target directory %s already contains a .bzr directory, "
-                    "but it is not valid.") % (location,))
             if not use_existing_dir:
                 raise errors.BzrCommandError(gettext("Target directory %s"
                      " already exists, but does not have a .bzr"

=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2012-01-19 14:17:55 +0000
+++ bzrlib/remote.py	2012-01-19 18:54:35 +0000
@@ -679,6 +679,7 @@
         b = self.open_branch(name=name)
         return b._format
 
+<<<<<<< TREE
     def get_branches(self, possible_transports=None, ignore_fallbacks=False):
         path = self._path_for_remote_call(self._client)
         try:
@@ -702,6 +703,13 @@
         self._ensure_real()
         return self._real_bzrdir.set_branch_reference(target_branch, name=name)
 
+=======
+    def set_branch_reference(self, target_branch, name=None):
+        """See BzrDir.set_branch_reference()."""
+        self._ensure_real()
+        return self._real_bzrdir.set_branch_reference(target_branch, name=name)
+
+>>>>>>> MERGE-SOURCE
     def get_branch_reference(self, name=None):
         """See BzrDir.get_branch_reference()."""
         if name is not None:

=== modified file 'bzrlib/tests/blackbox/test_checkout.py'
--- bzrlib/tests/blackbox/test_checkout.py	2012-01-05 13:02:31 +0000
+++ bzrlib/tests/blackbox/test_checkout.py	2012-01-19 18:54:35 +0000
@@ -76,6 +76,13 @@
         self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
         self.assertPathDoesNotExist('checkout/added_in_2')
 
+    def test_checkout_into_empty_dir(self):
+        self.make_bzrdir('checkout')
+        out, err = self.run_bzr(['checkout', 'branch', 'checkout'])
+        result = bzrdir.BzrDir.open('checkout')
+        tree = result.open_workingtree()
+        branch = result.open_branch()
+
     def test_checkout_reconstitutes_working_trees(self):
         # doing a 'bzr checkout' in the directory of a branch with no tree
         # or a 'bzr checkout path' with path the name of a directory with

=== modified file 'bzrlib/tests/per_controldir/test_controldir.py'
--- bzrlib/tests/per_controldir/test_controldir.py	2012-01-18 17:47:06 +0000
+++ bzrlib/tests/per_controldir/test_controldir.py	2012-01-19 18:54:35 +0000
@@ -108,6 +108,17 @@
         self.assertRaises(errors.UninitializableFormat,
             self.bzrdir_format.initialize, t.base)
 
+    def test_multiple_initialization(self):
+        # loopback test to check the current format initializes to itself.
+        if not self.bzrdir_format.is_initializable():
+            # unsupported formats are not loopback testable
+            # because the default open will not open them and
+            # they may not be initializable.
+            raise TestNotApplicable("format is not initializable")
+        self.bzrdir_format.initialize('.')
+        self.assertRaises(errors.AlreadyControlDirError,
+            self.bzrdir_format.initialize, '.')
+
     def test_create_null_workingtree(self):
         dir = self.make_bzrdir('dir1')
         dir.create_repository()

=== modified file 'bzrlib/tests/test_smart.py'
--- bzrlib/tests/test_smart.py	2012-01-06 22:06:36 +0000
+++ bzrlib/tests/test_smart.py	2012-01-19 18:54:35 +0000
@@ -512,7 +512,7 @@
         backing = self.get_transport()
         request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
         self.make_bzrdir('subdir')
-        self.assertRaises(errors.FileExists,
+        self.assertRaises(errors.AlreadyControlDirError,
             request.execute, 'subdir')
 
 

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2012-01-19 16:51:39 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2012-01-19 18:54:35 +0000
@@ -26,6 +26,7 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
+<<<<<<< TREE
 * "bzr switch -b" in a standalone tree will now create a colocated branch.
   (Jelmer Vernooij, #918197)
 
@@ -34,18 +35,30 @@
 
 * New HPSS call for ``BzrDir.get_branches``. (Jelmer Vernooij, #894460)
 
+=======
+* Checkouts can now be into target directories that already have
+  a control directory (but no branch or working tree).
+  (Jelmer Vernooij, #913980)
+
+>>>>>>> MERGE-SOURCE
 Bug Fixes
 *********
 
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+<<<<<<< TREE
 * ``bzr branch`` now fetches revisions when branching into an empty
   control directory. (Jelmer Vernooij, #905594)
 
 * Support scripts that don't call bzrlib.initialize() but still call run_bzr().
   (Vincent Ladeuil, #917733)
 
+=======
+* Support scripts that don't call bzrlib.initialize() but still call run_bzr().
+  (Vincent Ladeuil, #917733)
+
+>>>>>>> MERGE-SOURCE
 * Test for equality instead of object identity where ROOT_PARENT is concerned.
   (Wouter van Heyst, #881142)