Merge lp:~jelmer/brz/switch-git-bug into lp:brz

[Jelmer Vernooij]

Fix switching between branches while preserving uncommitted changes in git.

=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2018-11-18 19:48:57 +0000
+++ breezy/bzr/bzrdir.py	2019-04-13 21:38:37 +0000
@@ -448,8 +448,9 @@
 
         # Create/update the result working tree
         if (create_tree_if_local and not result.has_workingtree()
-            and isinstance(target_transport, local.LocalTransport)
-                and (result_repo is None or result_repo.make_working_trees())):
+                and isinstance(target_transport, local.LocalTransport)
+                and (result_repo is None or result_repo.make_working_trees())
+                and result.open_branch(name="").name == result_branch.name):
             wt = result.create_workingtree(
                 accelerator_tree=accelerator_tree, hardlink=hardlink,
                 from_branch=result_branch)

=== modified file 'breezy/controldir.py'
--- breezy/controldir.py	2018-11-12 01:41:38 +0000
+++ breezy/controldir.py	2019-04-13 21:38:37 +0000
@@ -443,12 +443,12 @@
             try:
                 tree_to = self.open_workingtree()
             except errors.NotLocalUrl:
-                push_result.branch_push_result = source.push(br_to,
-                                                             overwrite, stop_revision=revision_id, lossy=lossy)
+                push_result.branch_push_result = source.push(
+                    br_to, overwrite, stop_revision=revision_id, lossy=lossy)
                 push_result.workingtree_updated = False
             except errors.NoWorkingTree:
-                push_result.branch_push_result = source.push(br_to,
-                                                             overwrite, stop_revision=revision_id, lossy=lossy)
+                push_result.branch_push_result = source.push(
+                    br_to, overwrite, stop_revision=revision_id, lossy=lossy)
                 push_result.workingtree_updated = None  # Not applicable
             else:
                 with tree_to.lock_write():

=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2018-11-16 11:37:47 +0000
+++ breezy/git/dir.py	2019-04-13 21:38:37 +0000
@@ -182,6 +182,7 @@
         result_branch = source_branch.sprout(
             result, revision_id=revision_id, repository=result_repo)
         if (create_tree_if_local and
+            result.open_branch(name="").name == result_branch.name and
             isinstance(target_transport, LocalTransport) and
                 (result_repo is None or result_repo.make_working_trees())):
             result.create_workingtree(
@@ -302,6 +303,18 @@
             lossy=lossy)
         push_result.new_revid = push_result.branch_push_result.new_revid
         push_result.old_revid = push_result.branch_push_result.old_revid
+        try:
+            wt = self.open_workingtree()
+        except brz_errors.NoWorkingTree:
+            push_result.workingtree_updated = None
+        else:
+            if self.open_branch(name="").name == target.name:
+                wt._update_git_tree(
+                    old_revision=push_result.old_revid,
+                    new_revision=push_result.new_revid)
+                push_result.workingtree_updated = True
+            else:
+                push_result.workingtree_updated = False
         push_result.target_branch = target
         if source.get_push_location() is None or remember:
             source.set_push_location(push_result.target_branch.base)

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2019-02-17 04:08:56 +0000
+++ breezy/git/tests/test_blackbox.py	2019-04-13 21:38:37 +0000
@@ -35,6 +35,7 @@
 from .. import (
     tests,
     )
+from ...tests.script import TestCaseWithTransportAndScript
 from ...tests.features import PluginLoadedFeature
 
 
@@ -393,6 +394,30 @@
                 self.assertEqual([], list(tree.iter_changes(basis_tree)))
 
 
+class SwitchScriptTests(TestCaseWithTransportAndScript):
+
+    def test_switch_preserves(self):
+        # See https://bugs.launchpad.net/brz/+bug/1820606
+        self.run_script("""
+$ brz init --git r
+Created a standalone tree (format: git)
+$ cd r
+$ echo original > file.txt
+$ brz add
+adding file.txt
+$ brz ci -q -m "Initial"
+$ echo "entered on master branch" > file.txt
+$ brz stat
+modified:
+  file.txt
+$ brz switch -b other
+2>Tree is up to date at revision 1.
+2>Switched to branch other
+$ cat file.txt
+entered on master branch
+""")
+
+
 class GrepTests(ExternalBase):
 
     def test_simple_grep(self):

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2019-02-05 04:00:02 +0000
+++ breezy/git/workingtree.py	2019-04-13 21:38:37 +0000
@@ -1202,26 +1202,33 @@
                     (index, subpath) = self._lookup_index(entry.path)
                     index[subpath] = index_entry_from_stat(st, entry.sha, 0)
 
+    def _update_git_tree(self, old_revision, new_revision, change_reporter=None,
+                         show_base=False):
+        basis_tree = self.revision_tree(old_revision)
+        if new_revision != old_revision:
+            with basis_tree.lock_read():
+                new_basis_tree = self.branch.basis_tree()
+                merge.merge_inner(
+                    self.branch,
+                    new_basis_tree,
+                    basis_tree,
+                    this_tree=self,
+                    change_reporter=change_reporter,
+                    show_base=show_base)
+
     def pull(self, source, overwrite=False, stop_revision=None,
              change_reporter=None, possible_transports=None, local=False,
              show_base=False):
         with self.lock_write(), source.lock_read():
             old_revision = self.branch.last_revision()
-            basis_tree = self.basis_tree()
             count = self.branch.pull(source, overwrite, stop_revision,
                                      possible_transports=possible_transports,
                                      local=local)
-            new_revision = self.branch.last_revision()
-            if new_revision != old_revision:
-                with basis_tree.lock_read():
-                    new_basis_tree = self.branch.basis_tree()
-                    merge.merge_inner(
-                        self.branch,
-                        new_basis_tree,
-                        basis_tree,
-                        this_tree=self,
-                        change_reporter=change_reporter,
-                        show_base=show_base)
+            self._update_git_tree(
+                old_revision=old_revision,
+                new_revision=self.branch.last_revision(),
+                change_reporter=change_reporter,
+                show_base=show_base)
             return count
 
     def add_reference(self, sub_tree):

=== modified file 'breezy/switch.py'
--- breezy/switch.py	2018-11-16 23:28:26 +0000
+++ breezy/switch.py	2019-04-13 21:38:37 +0000
@@ -148,15 +148,12 @@
                     'Unable to connect to current master branch %(target)s: '
                     '%(error)s To switch anyway, use --force.') %
                     e.__dict__)
-            b.lock_write()
-            try:
+            with b.lock_write():
                 b.set_bound_location(None)
                 b.pull(to_branch, overwrite=True,
                        possible_transports=possible_transports)
                 b.set_bound_location(to_branch.base)
                 b.set_parent(b.get_master_branch().get_parent())
-            finally:
-                b.unlock()
         else:
             # If this is a standalone tree and the new branch
             # is derived from this one, create a lightweight checkout.

=== modified file 'breezy/tests/per_controldir_colo/test_supported.py'
--- breezy/tests/per_controldir_colo/test_supported.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_controldir_colo/test_supported.py	2019-04-13 21:38:37 +0000
@@ -114,10 +114,47 @@
                 'Control dir does not support creating new branches.')
         to_dir = from_tree.controldir.sprout(
             urlutils.join_segment_parameters(
-                other_branch.controldir.user_url, {"branch": "target"}))
+                other_branch.user_url, {"branch": "target"}))
         to_branch = to_dir.open_branch(name="target")
         self.assertEqual(revid, to_branch.last_revision())
 
+    def test_sprout_into_colocated_leaves_workingtree(self):
+        # a bzrdir can construct a branch and repository for itself.
+        if not self.bzrdir_format.is_supported():
+            # unsupported formats are not loopback testable
+            # because the default open will not open them and
+            # they may not be initializable.
+            raise tests.TestNotApplicable('Control dir format not supported')
+        if not self.bzrdir_format.supports_workingtrees:
+            raise tests.TestNotApplicable(
+                'Control dir format does not support working trees')
+        from_tree = self.make_branch_and_tree('from')
+        self.build_tree_contents([('from/foo', 'contents')])
+        from_tree.add(['foo'])
+        revid1 = from_tree.commit("rev1")
+        self.build_tree_contents([('from/foo', 'new contents')])
+        revid2 = from_tree.commit("rev2")
+        try:
+            other_branch = self.make_branch_and_tree("to")
+        except errors.UninitializableFormat:
+            raise tests.TestNotApplicable(
+                'Control dir does not support creating new branches.')
+
+        result = other_branch.controldir.push_branch(
+            from_tree.branch, revision_id=revid1)
+        self.assertTrue(result.workingtree_updated)
+        self.assertFileEqual('contents', 'to/foo')
+
+        from_tree.controldir.sprout(
+            urlutils.join_segment_parameters(
+                other_branch.user_url, {"branch": "target"}),
+            revision_id=revid2)
+        active_branch = other_branch.controldir.open_branch(name="")
+        self.assertEqual(revid1, active_branch.last_revision())
+        to_branch = other_branch.controldir.open_branch(name="target")
+        self.assertEqual(revid2, to_branch.last_revision())
+        self.assertFileEqual('contents', 'to/foo')
+
     def test_unicode(self):
         self.requireFeature(UnicodeFilenameFeature)
         if not self.bzrdir_format.is_supported():

=== modified file 'setup.py'
--- setup.py	2019-03-04 10:39:09 +0000
+++ setup.py	2019-04-13 21:38:37 +0000
@@ -149,8 +149,7 @@
                 script_path = self._quoted_path(os.path.join(scripts_dir,
                                                              "brz"))
                 python_exe = self._quoted_path(sys.executable)
-                args = self._win_batch_args()
-                batch_str = "@%s %s %s" % (python_exe, script_path, args)
+                batch_str = "@%s %s %%*" % (python_exe, script_path)
                 batch_path = os.path.join(self.install_dir, "brz.bat")
                 with open(batch_path, "w") as f:
                     f.write(batch_str)
@@ -164,13 +163,6 @@
             return '"' + path + '"'
         else:
             return path
-
-    def _win_batch_args(self):
-        from breezy.win32utils import winver
-        if winver == 'Windows NT':
-            return '%*'
-        else:
-            return '%1 %2 %3 %4 %5 %6 %7 %8 %9'
 #/class my_install_scripts