Merge lp:~jelmer/bzr/merge-distinguish-working-tree into lp:bzr

[Jelmer Vernooij]

Properly distinguish the working tree (the tree to which we're going to be applying the found changes) from the this_tree in the merge.

This is required for some of the bzr-builddeb hooks I'm working on.

[Martin Packman (gz)]

Proposal should have <lp:~jelmer/bzr/propagate-other-branch> as a prerequisite?

Without seeing how this will be hooked up outside merge I'm not clear on how the parts will interact.

+ self.working_tree.lock_tree_write()
+ operation.add_cleanup(self.working_tree.unlock)
+ self.this_tree.lock_read()
- self.this_tree.lock_tree_write()
         operation.add_cleanup(self.this_tree.unlock)

Can working_tree and this_tree be the same location? If so this won't work.

review: Needs Information

=== modified file 'bzrlib/merge.py'
--- bzrlib/merge.py	2011-12-20 13:13:25 +0000
+++ bzrlib/merge.py	2012-01-02 22:55:26 +0000
@@ -617,6 +617,7 @@
                   'interesting_ids': self.interesting_ids,
                   'interesting_files': self.interesting_files,
                   'this_branch': self.this_branch,
+                  'other_branch': self.other_branch,
                   'do_merge': False}
         if self.merge_type.requires_base:
             kwargs['base_tree'] = self.base_tree
@@ -725,7 +726,8 @@
                  interesting_ids=None, reprocess=False, show_base=False,
                  pb=None, pp=None, change_reporter=None,
                  interesting_files=None, do_merge=True,
-                 cherrypick=False, lca_trees=None, this_branch=None):
+                 cherrypick=False, lca_trees=None, this_branch=None,
+                 other_branch=None):
         """Initialize the merger object and perform the merge.
 
         :param working_tree: The working tree to apply the merge to
@@ -734,6 +736,7 @@
         :param other_tree: The other tree to merge changes from
         :param this_branch: The branch associated with this_tree.  Defaults to
             this_tree.branch if not supplied.
+        :param other_branch: The branch associated with other_tree, if any.
         :param interesting_ids: The file_ids of files that should be
             participate in the merge.  May not be combined with
             interesting_files.
@@ -761,10 +764,12 @@
             this_branch = this_tree.branch
         self.interesting_ids = interesting_ids
         self.interesting_files = interesting_files
-        self.this_tree = working_tree
+        self.working_tree = working_tree
+        self.this_tree = this_tree
         self.base_tree = base_tree
         self.other_tree = other_tree
         self.this_branch = this_branch
+        self.other_branch = other_branch
         self._raw_conflicts = []
         self.cooked_conflicts = []
         self.reprocess = reprocess
@@ -786,7 +791,9 @@
 
     def do_merge(self):
         operation = cleanup.OperationWithCleanups(self._do_merge)
-        self.this_tree.lock_tree_write()
+        self.working_tree.lock_tree_write()
+        operation.add_cleanup(self.working_tree.unlock)
+        self.this_tree.lock_read()
         operation.add_cleanup(self.this_tree.unlock)
         self.base_tree.lock_read()
         operation.add_cleanup(self.base_tree.unlock)
@@ -795,13 +802,13 @@
         operation.run()
 
     def _do_merge(self, operation):
-        self.tt = transform.TreeTransform(self.this_tree, None)
+        self.tt = transform.TreeTransform(self.working_tree, None)
         operation.add_cleanup(self.tt.finalize)
         self._compute_transform()
         results = self.tt.apply(no_conflicts=True)
         self.write_modified(results)
         try:
-            self.this_tree.add_conflicts(self.cooked_conflicts)
+            self.working_tree.add_conflicts(self.cooked_conflicts)
         except errors.UnsupportedOperation:
             pass
 
@@ -814,7 +821,7 @@
         return operation.run_simple()
 
     def _make_preview_transform(self):
-        self.tt = transform.TransformPreview(self.this_tree)
+        self.tt = transform.TransformPreview(self.working_tree)
         self._compute_transform()
         return self.tt
 
@@ -1119,14 +1126,14 @@
     def write_modified(self, results):
         modified_hashes = {}
         for path in results.modified_paths:
-            file_id = self.this_tree.path2id(self.this_tree.relpath(path))
+            file_id = self.working_tree.path2id(self.working_tree.relpath(path))
             if file_id is None:
                 continue
-            hash = self.this_tree.get_file_sha1(file_id)
+            hash = self.working_tree.get_file_sha1(file_id)
             if hash is None:
                 continue
             modified_hashes[file_id] = hash
-        self.this_tree.set_merge_modified(modified_hashes)
+        self.working_tree.set_merge_modified(modified_hashes)
 
     @staticmethod
     def parent(entry, file_id):

=== modified file 'bzrlib/tests/test_merge.py'
--- bzrlib/tests/test_merge.py	2011-12-21 12:34:21 +0000
+++ bzrlib/tests/test_merge.py	2012-01-02 22:55:26 +0000
@@ -446,8 +446,11 @@
         merger.merge_type = _mod_merge.Merge3Merger
         tree_merger = merger.make_merger()
         self.assertIs(_mod_merge.Merge3Merger, tree_merger.__class__)
-        self.assertEqual('rev2b', tree_merger.other_tree.get_revision_id())
-        self.assertEqual('rev1', tree_merger.base_tree.get_revision_id())
+        self.assertEqual('rev2b',
+            tree_merger.other_tree.get_revision_id())
+        self.assertEqual('rev1',
+            tree_merger.base_tree.get_revision_id())
+        self.assertEqual(other_tree.branch, tree_merger.other_branch)
 
     def test_make_preview_transform(self):
         this_tree = self.make_branch_and_tree('this')

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2011-12-22 18:52:58 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2012-01-02 22:55:26 +0000
@@ -144,6 +144,10 @@
 
 * Lazy imports can now only be absolute. (Jelmer Vernooij)
 
+* Merge3Mergers now have an optional ``other_branch`` argument
+  which contains the branch from which the ``other_tree``
+  was obtained, if any. (Jelmer Vernooij)
+
 * New HPSS call ``BzrDir.checkout_metadir``. (Jelmer Vernooij, #894459)
 
 * New HPSS call ``VersionedFileRepository.get_inventories``,