Merge lp:~jelmer/brz/custom-revprops into lp:brz

[Jelmer Vernooij]

Allow formats to not support custom revision properties.

[Martin Packman (gz)]

Okay, seems reasonable.

review: Approve

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2017-11-21 21:17:13 +0000
+++ breezy/repository.py	2018-02-10 15:09:07 +0000
@@ -1300,6 +1300,8 @@
     supports_storing_branch_nick = True
     # Does the format support overriding the transport to use
     supports_overriding_transport = True
+    # Does the format support setting custom revision properties?
+    supports_custom_revision_properties = True
 
     def __repr__(self):
         return "%s()" % self.__class__.__name__

=== modified file 'breezy/tests/per_repository/test_commit_builder.py'
--- breezy/tests/per_repository/test_commit_builder.py	2018-01-22 01:01:48 +0000
+++ breezy/tests/per_repository/test_commit_builder.py	2018-02-10 15:09:07 +0000
@@ -449,6 +449,7 @@
             expect_fs_hash=False, mini_commit=None):
         tree.add([name])
         file_id = tree.path2id(name)
+        self.assertIsNot(None, file_id)
         self._commit_change_check_changed(
             tree, name, file_id,
             changer, expect_fs_hash=expect_fs_hash, mini_commit=mini_commit)
@@ -500,6 +501,7 @@
             result = list(builder.record_iter_changes(tree, parent_ids[0],
                 changes))
             file_id = tree.path2id(new_name)
+            self.assertIsNot(None, file_id)
             if expect_fs_hash:
                 tree_file_stat = tree.get_file_with_stat(new_name)
                 tree_file_stat[0].close()
@@ -598,6 +600,7 @@
         """Do a rename in both trees."""
         rev1, tree2 = self._commit_sprout(tree1, name)
         file_id = tree2.path2id(name)
+        self.assertIsNot(None, file_id)
         # change both sides equally
         rev2 = self._rename_in_tree(tree1, name)
         rev3 = self._rename_in_tree(tree2, name)
@@ -643,6 +646,7 @@
         # Part 1: change in the merged branch.
         rev1, tree2 = self._commit_sprout(tree1, name)
         file_id = tree2.path2id(name)
+        self.assertIsNot(None, file_id)
         # change on the other side to merge back
         rev2 = self._rename_in_tree(tree2, name)
         tree1.merge_from_branch(tree2.branch)
@@ -676,6 +680,7 @@
         make('t2/name')
         tree2.add(['name'])
         file_id = tree2.path2id('name')
+        self.assertIsNot(None, file_id)
         rev2 = tree2.commit('')
         tree1.merge_from_branch(tree2.branch)
         rev3 = mini_commit(tree1, None, 'name', False)

=== modified file 'breezy/tests/per_repository/test_repository.py'
--- breezy/tests/per_repository/test_repository.py	2018-01-12 08:52:43 +0000
+++ breezy/tests/per_repository/test_repository.py	2018-02-10 15:09:07 +0000
@@ -122,6 +122,11 @@
         self.assertFormatAttribute('supports_storing_branch_nick',
             (True, False))
 
+    def test_attribute_format_supports_custom_revision_properties(self):
+        self.assertFormatAttribute(
+                'supports_custom_revision_properties',
+                (True, False))
+
     def test_attribute_format_supports_overriding_transport(self):
         repo = self.make_repository('repo')
         self.assertIn(repo._format.supports_overriding_transport, (True, False))

=== modified file 'breezy/tests/per_repository/test_revision.py'
--- breezy/tests/per_repository/test_revision.py	2017-11-21 00:34:39 +0000
+++ breezy/tests/per_repository/test_revision.py	2018-02-10 15:09:07 +0000
@@ -16,6 +16,7 @@
 
 """Tests for revision properties."""
 
+from breezy.tests import TestNotApplicable
 from breezy.tests.per_repository import (
     TestCaseWithRepository,
     )
@@ -27,30 +28,40 @@
         wt = self.make_branch_and_tree('.')
         b = wt.branch
         b.nick = 'Nicholas'
-        props = dict(flavor='choc-mint',
-                     condiment='orange\n  mint\n\tcandy',
-                     empty='',
-                     non_ascii=u'\xb5')
+        if b.repository._format.supports_custom_revision_properties:
+            props = dict(flavor='choc-mint',
+                         condiment='orange\n  mint\n\tcandy',
+                         empty='',
+                         non_ascii=u'\xb5')
+        else:
+            props = {}
         rev1 = wt.commit(message='initial null commit',
                  revprops=props,
                  allow_pointless=True)
         rev = b.repository.get_revision(rev1)
-        self.assertTrue('flavor' in rev.properties)
-        self.assertEqual(rev.properties['flavor'], 'choc-mint')
-        expected_revprops = {
-            'condiment': 'orange\n  mint\n\tcandy',
-            'empty': '',
-            'flavor': 'choc-mint',
-            'non_ascii': u'\xb5',
-            }
+        if b.repository._format.supports_custom_revision_properties:
+            self.assertTrue('flavor' in rev.properties)
+            self.assertEqual(rev.properties['flavor'], 'choc-mint')
+            expected_revprops = {
+                'condiment': 'orange\n  mint\n\tcandy',
+                'empty': '',
+                'flavor': 'choc-mint',
+                'non_ascii': u'\xb5',
+                }
+        else:
+            expected_revprops = {}
         if b.repository._format.supports_storing_branch_nick:
             expected_revprops['branch-nick'] = 'Nicholas'
-        self.assertEqual(expected_revprops, rev.properties)
+        for name, value in expected_revprops.items():
+            self.assertEqual(rev.properties[name], value)
 
     def test_invalid_revprops(self):
         """Invalid revision properties"""
         wt = self.make_branch_and_tree('.')
         b = wt.branch
+        if not b.repository._format.supports_custom_revision_properties:
+            raise TestNotApplicable(
+                    'format does not support custom revision properties')
         self.assertRaises(ValueError,
                           wt.commit,
                           message='invalid',
@@ -69,15 +80,17 @@
         same as the ones that go in.
         """
         tree1 = self.make_branch_and_tree("br1")
-
-        # create a revision
-        rev1 = tree1.commit(message="quux", allow_pointless=True,
-            committer="jaq",
+        if tree1.branch.repository._format.supports_custom_revision_properties:
             revprops={'empty':'',
                       'value':'one',
                       'unicode':u'\xb5',
                       'multiline':'foo\nbar\n\n'
-                      })
+                      }
+        else:
+            revprops = {}
+        # create a revision
+        rev1 = tree1.commit(message="quux", allow_pointless=True,
+            committer="jaq", revprops=revprops)
         self.assertEqual(tree1.branch.last_revision(), rev1)
         rev_a = tree1.branch.repository.get_revision(
                             tree1.branch.last_revision())

=== modified file 'breezy/tests/per_workingtree/test_get_file_mtime.py'
--- breezy/tests/per_workingtree/test_get_file_mtime.py	2018-01-12 08:52:43 +0000
+++ breezy/tests/per_workingtree/test_get_file_mtime.py	2018-02-10 15:09:07 +0000
@@ -92,7 +92,7 @@
         self.build_tree(['tree/d/', 'tree/d/a'])
         tree.add(['d', 'd/a'])
         a_id = tree.path2id('d/a')
-        tree.commit('1', rev_id='rev-1')
+        rev_1 = tree.commit('1')
 
         tree.rename_one('d', 'e')
 

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2018-01-12 08:52:43 +0000
+++ breezy/tree.py	2018-02-10 15:09:07 +0000
@@ -1082,7 +1082,7 @@
         """
         try:
             inventory = tree.root_inventory
-        except NotImplementedError:
+        except (AttributeError, NotImplementedError):
             # No inventory available.
             try:
                 iterator = tree.iter_entries_by_dir(specific_file_ids=[file_id])