Merge lp:~luks/bzr/branch-switch into lp:~bzr/bzr/trunk-old

[Lukáš Lalinský]

Support for `bzr branch --switch`

[Lukáš Lalinský (luks)]

This patch adds a new option to bzr branch that allows to switch the checkout in the current directory to the new branch. This is based on yesterday's discussion in #bzr -- http://irclogs.ubuntu.com/2009/08/10/%23bzr.html from 19:48. Another option was to add a "source" argument to bzr switch -b (http://paste.pocoo.org/show/133506/), but the only way seems to be to add it to the end of the command line and "bzr <command> <target> <source>" is not used in any other bzr command except for bzr export.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Lukáš Lalinský wrote:
> Lukáš Lalinský has proposed merging lp:~luks/bzr/branch-switch into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> This patch adds a new option to bzr branch that allows to switch the checkout in the current directory to the new branch. This is based on yesterday's discussion in #bzr -- http://irclogs.ubuntu.com/2009/08/10/%23bzr.html from 19:48. Another option was to add a "source" argument to bzr switch -b (http://paste.pocoo.org/show/133506/), but the only way seems to be to add it to the end of the command line and "bzr <command> <target> <source>" is not used in any other bzr command except for bzr export.
>

I would like to see a test for what happens when you are only in a
branch, and not a working tree at all.

I'd also like to see "test_branch_switch_no_checkout" assert what
happens as a side effect. Does it:
1) Create/not create the branch 'b'?
2) Do anything to the local branch or working tree?

Also, I think we should have a test with a heavyweight checkout, to
assert what it does there.

Note that I'm not particularly strong on what the answers to the
questions should be. I just want the behavior identified, so we don't
accidentally change it in the future.

 review needs_fixing

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqBnGQACgkQJdeBCYSNAAOicwCfdIjxHxP0i5y68vllU8YyArZS
EEQAn2PL4ykfHtQWUfwxkFUH3zXVGr7K
=Et4B
-----END PGP SIGNATURE-----

review: Needs Fixing

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Lukáš Lalinský wrote:
> Lukáš Lalinský has proposed merging lp:~luks/bzr/branch-switch into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>

 review approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqBtG4ACgkQJdeBCYSNAAOGFwCcCUgzwlsN3jypt4XMwwcVdG7e
Ll8AoJOhoFbtxH6LcEraHFy/dD8hCIG5
=3FMl
-----END PGP SIGNATURE-----

review: Approve

[Robert Collins (lifeless)]

I thought we had 'switch -b' for this case? Is there really a need to
have both switch --branch and branch --switch?

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> I thought we had 'switch -b' for this case? Is there really a need to
> have both switch --branch and branch --switch?
>
>
>

branch --switch allows for a custom source that isn't "."

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqB5WoACgkQJdeBCYSNAAMYjgCfVedumO+/Xo/jgl0kYg0bkPyn
t9IAn1tIjmrIboawgHcw5E17jKAg4NAy
=KqUk
-----END PGP SIGNATURE-----

[Alexander Belchenko (bialix)]

I like the idea and implementation.

John, can you merge this, please?

review: Approve

[Vincent Ladeuil (vila)]

Sent to pqm

=== modified file 'NEWS'
--- NEWS	2009-08-20 05:32:57 +0000
+++ NEWS	2009-08-20 08:35:58 +0000
@@ -12,6 +12,7 @@
 Compatibility Breaks
 ********************
 
+<<<<<<< TREE
 * The default format for bzr is now ``2a``. This format brings many
   significant performance and size improvements. bzr can pull from
   any existing repository into a ``2a`` one, but can only transfer
@@ -83,6 +84,16 @@
 
 * Fixed "Pack ... already exists" error when running ``bzr pack`` on a
   fully packed 2a repository.  (Andrew Bennetts, #382463)
+=======
+New Features
+************
+
+* ``bzr branch --switch`` can now switch the checkout in the current directory
+  to the newly created branch. (Lukáš Lalinský)
+
+Bug Fixes
+*********
+>>>>>>> MERGE-SOURCE
 
 * Further tweaks to handling of ``bzr add`` messages about ignored files.
   (Jason Spashett, #76616)

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2009-08-10 08:25:53 +0000
+++ bzrlib/builtins.py	2009-08-20 08:35:58 +0000
@@ -1167,6 +1167,9 @@
         help='Hard-link working tree files where possible.'),
         Option('no-tree',
             help="Create a branch without a working-tree."),
+        Option('switch',
+            help="Switch the checkout in the current directory "
+                 "to the new branch."),
         Option('stacked',
             help='Create a stacked branch referring to the source branch. '
                 'The new branch will depend on the availability of the source '
@@ -1183,9 +1186,9 @@
 
     def run(self, from_location, to_location=None, revision=None,
             hardlink=False, stacked=False, standalone=False, no_tree=False,
-            use_existing_dir=False):
+            use_existing_dir=False, switch=False):
+        from bzrlib import switch as _mod_switch
         from bzrlib.tag import _merge_tags_if_possible
-
         accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
             from_location)
         if (accelerator_tree is not None and
@@ -1245,6 +1248,12 @@
             except (errors.NotStacked, errors.UnstackableBranchFormat,
                 errors.UnstackableRepositoryFormat), e:
                 note('Branched %d revision(s).' % branch.revno())
+            if switch:
+                # Switch to the new branch
+                wt, _ = WorkingTree.open_containing('.')
+                _mod_switch.switch(wt.bzrdir, branch)
+                note('Switched to branch: %s',
+                    urlutils.unescape_for_display(branch.base, 'utf-8'))
         finally:
             br_from.unlock()
 

=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- bzrlib/tests/blackbox/test_branch.py	2009-08-11 05:26:57 +0000
+++ bzrlib/tests/blackbox/test_branch.py	2009-08-20 08:35:58 +0000
@@ -19,7 +19,13 @@
 
 import os
 
-from bzrlib import (branch, bzrdir, errors, repository)
+from bzrlib import (
+    branch,
+    bzrdir,
+    errors,
+    repository,
+    revision as _mod_revision,
+    )
 from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
 from bzrlib.tests.blackbox import ExternalBase
 from bzrlib.tests import (
@@ -52,6 +58,72 @@
         self.assertFalse(b._transport.has('branch-name'))
         b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
 
+    def test_branch_switch_no_branch(self):
+        # No branch in the current directory:
+        #  => new branch will be created, but switch fails
+        self.example_branch('a')
+        self.make_repository('current')
+        self.run_bzr_error(['No WorkingTree exists for'],
+            'branch --switch ../a ../b', working_dir='current')
+        a = branch.Branch.open('a')
+        b = branch.Branch.open('b')
+        self.assertEqual(a.last_revision(), b.last_revision())
+
+    def test_branch_switch_no_wt(self):
+        # No working tree in the current directory:
+        #  => new branch will be created, but switch fails and the current
+        #     branch is unmodified
+        self.example_branch('a')
+        self.make_branch('current')
+        self.run_bzr_error(['No WorkingTree exists for'],
+            'branch --switch ../a ../b', working_dir='current')
+        a = branch.Branch.open('a')
+        b = branch.Branch.open('b')
+        self.assertEqual(a.last_revision(), b.last_revision())
+        work = branch.Branch.open('current')
+        self.assertEqual(work.last_revision(), _mod_revision.NULL_REVISION)
+
+    def test_branch_switch_no_checkout(self):
+        # Standalone branch in the current directory:
+        #  => new branch will be created, but switch fails and the current
+        #     branch is unmodified
+        self.example_branch('a')
+        self.make_branch_and_tree('current')
+        self.run_bzr_error(['Cannot switch a branch, only a checkout'],
+            'branch --switch ../a ../b', working_dir='current')
+        a = branch.Branch.open('a')
+        b = branch.Branch.open('b')
+        self.assertEqual(a.last_revision(), b.last_revision())
+        work = branch.Branch.open('current')
+        self.assertEqual(work.last_revision(), _mod_revision.NULL_REVISION)
+
+    def test_branch_switch_checkout(self):
+        # Checkout in the current directory:
+        #  => new branch will be created and checkout bound to the new branch
+        self.example_branch('a')
+        self.run_bzr('checkout a current')
+        out, err = self.run_bzr('branch --switch ../a ../b', working_dir='current')
+        a = branch.Branch.open('a')
+        b = branch.Branch.open('b')
+        self.assertEqual(a.last_revision(), b.last_revision())
+        work = WorkingTree.open('current')
+        self.assertEndsWith(work.branch.get_bound_location(), '/b/')
+        self.assertContainsRe(err, "Switched to branch: .*/b/")
+
+    def test_branch_switch_lightweight_checkout(self):
+        # Lightweight checkout in the current directory:
+        #  => new branch will be created and lightweight checkout pointed to
+        #     the new branch
+        self.example_branch('a')
+        self.run_bzr('checkout --lightweight a current')
+        out, err = self.run_bzr('branch --switch ../a ../b', working_dir='current')
+        a = branch.Branch.open('a')
+        b = branch.Branch.open('b')
+        self.assertEqual(a.last_revision(), b.last_revision())
+        work = WorkingTree.open('current')
+        self.assertEndsWith(work.branch.base, '/b/')
+        self.assertContainsRe(err, "Switched to branch: .*/b/")
+
     def test_branch_only_copies_history(self):
         # Knit branches should only push the history for the current revision.
         format = bzrdir.BzrDirMetaFormat1()