Merge lp:~jelmer/brz/wt-righthand-ghost-parents into lp:brz

[Jelmer Vernooij]

Allow working tree formats to specify that they don't support righthand ghost parents.

Allow working tree formats to specify that they don't support righthand ghost parents.

[Martin Packman (gz)]

Okay, fair enough.

review: Approve

[Vincent Ladeuil (vila)]

Running landing tests failed

=== modified file 'breezy/tests/per_workingtree/test_parents.py'
--- breezy/tests/per_workingtree/test_parents.py	2018-02-03 13:39:29 +0000
+++ breezy/tests/per_workingtree/test_parents.py	2018-02-25 15:43:15 +0000
@@ -102,9 +102,14 @@
         # remove the tree's history
         uncommit(t.branch, tree=t)
         rev_tree = t.branch.repository.revision_tree(revision_in_repo)
-        t.set_parent_trees([(revision_in_repo, rev_tree),
-            ('another-missing', None)])
-        self.assertConsistentParents([revision_in_repo, 'another-missing'], t)
+        if t._format.supports_righthand_parent_id_as_ghost:
+            t.set_parent_trees([(revision_in_repo, rev_tree),
+                ('another-missing', None)])
+            self.assertConsistentParents([revision_in_repo, 'another-missing'], t)
+        else:
+            self.assertRaises(errors.GhostRevisionUnusableHere,
+                t.set_parent_trees, [(revision_in_repo, rev_tree),
+                ('another-missing', None)])
 
     def test_set_three_parents(self):
         t = self.make_branch_and_tree('.')
@@ -154,8 +159,12 @@
         # remove the tree's history
         uncommit(t.branch, tree=t)
         rev_tree = t.branch.repository.revision_tree(revision_in_repo)
-        t.set_parent_ids([revision_in_repo, 'another-missing'])
-        self.assertConsistentParents([revision_in_repo, 'another-missing'], t)
+        if t._format.supports_righthand_parent_id_as_ghost:
+            t.set_parent_ids([revision_in_repo, 'another-missing'])
+            self.assertConsistentParents([revision_in_repo, 'another-missing'], t)
+        else:
+            self.assertRaises(errors.GhostRevisionUnusableHere,
+                t.set_parent_ids, [revision_in_repo, 'another-missing'])
 
     def test_set_three_parents_ids(self):
         t = self.make_branch_and_tree('.')
@@ -316,8 +325,12 @@
         """Test adding the second parent id - as a ghost"""
         tree = self.make_branch_and_tree('.')
         first_revision = tree.commit('first post')
-        tree.add_parent_tree_id('second')
-        self.assertConsistentParents([first_revision, 'second'], tree)
+        if tree._format.supports_righthand_parent_id_as_ghost:
+            tree.add_parent_tree_id('second')
+            self.assertConsistentParents([first_revision, 'second'], tree)
+        else:
+            self.assertRaises(errors.GhostRevisionUnusableHere,
+                    tree.add_parent_tree_id, 'second')
 
     def test_add_first_parent_tree(self):
         """Test adding the first parent id"""
@@ -360,8 +373,12 @@
         """Test adding the second parent id - as a ghost"""
         tree = self.make_branch_and_tree('.')
         first_revision = tree.commit('first post')
-        tree.add_parent_tree(('second', None))
-        self.assertConsistentParents([first_revision, 'second'], tree)
+        if tree._format.supports_righthand_parent_id_as_ghost:
+            tree.add_parent_tree(('second', None))
+            self.assertConsistentParents([first_revision, 'second'], tree)
+        else:
+            self.assertRaises(errors.GhostRevisionUnusableHere,
+                    tree.add_parent_tree, ('second', None))
 
 
 class UpdateToOneParentViaDeltaTests(TestCaseWithWorkingTree):
 
=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2018-02-17 02:57:14 +0000
+++ breezy/workingtree.py	2018-02-25 15:43:15 +0000
@@ -1419,6 +1419,8 @@
 
     supports_leftmost_parent_id_as_ghost = True
 
+    supports_righthand_parent_id_as_ghost = True
+
     def initialize(self, controldir, revision_id=None, from_branch=None,
                    accelerator_tree=None, hardlink=False):
         """Initialize a new working tree in controldir.