Merge lp:~jelmer/brz/merge-modified into lp:brz

[Jelmer Vernooij]

Allow working trees to not implement set_merge_modified.

Allow working trees to not implement set_merge_modified.

[Martin Packman (gz)]

Seems fine, but see inline notes for queries.

review: Approve

[Vincent Ladeuil (vila)]

Running landing tests failed

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2017-11-13 22:51:34 +0000
+++ breezy/merge.py	2018-02-26 23:17:11 +0000
@@ -1080,7 +1080,10 @@
             if hash is None:
                 continue
             modified_hashes[file_id] = hash
-        self.working_tree.set_merge_modified(modified_hashes)
+        try:
+            self.working_tree.set_merge_modified(modified_hashes)
+        except errors.UnsupportedOperation:
+            pass  # Well, whatever.
 
     @staticmethod
     def parent(entry, file_id):
 
=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2018-02-21 20:07:48 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2018-02-26 23:17:11 +0000
@@ -711,11 +711,22 @@
         with tree.lock_write():
             tree.add(['somefile'])
             d = {tree.path2id('somefile'): osutils.sha_string('hello')}
-            tree.set_merge_modified(d)
+            try:
+                tree.set_merge_modified(d)
+            except errors.UnsupportedOperation:
+                mm = tree.merge_modified()
+                self.assertEqual(mm, {})
+                supports_merge_modified = False
+            else:
+                mm = tree.merge_modified()
+                self.assertEqual(mm, d)
+                supports_merge_modified = True
+        if supports_merge_modified:
             mm = tree.merge_modified()
             self.assertEqual(mm, d)
-        mm = tree.merge_modified()
-        self.assertEqual(mm, d)
+        else:
+            mm = tree.merge_modified()
+            self.assertEqual(mm, {})
 
     def test_conflicts(self):
         from breezy.tests.test_conflicts import example_conflicts
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2018-01-12 08:52:43 +0000
+++ breezy/transform.py	2018-02-26 23:17:11 +0000
@@ -2874,7 +2874,10 @@
             trace.warning(unicode(conflict))
         pp.next_phase()
         tt.apply()
-        working_tree.set_merge_modified(merge_modified)
+        try:
+            working_tree.set_merge_modified(merge_modified)
+        except errors.UnsupportedOperation:
+            pass  # well, whatever.
     finally:
         target_tree.unlock()
         tt.finalize()