Merge lp:~jelmer/bzr-svn/require-fileprop-settings into lp:bzr-svn/1.1

[Jelmer Vernooij]

Disable pushing to file properties by default.

This can be disabled by setting `allow_metadata_in_file_properties`.

=== modified file 'NEWS'
--- NEWS	2011-03-23 18:03:00 +0000
+++ NEWS	2011-03-23 23:35:40 +0000
@@ -67,6 +67,9 @@
   * Fix ControlDir.sprout() implementation for newer versions of bzr.
     (Jelmer Vernooij, #717937)
 
+  * bzr-svn no longer uses file properties to store metadata anymore, unless
+    `allow_metadata_in_file_properties`. (Jelmer Vernooij, #704716)
+
  FEATURES
 
   * When roundtripping revisions a revision property with the Bazaar testament is

=== modified file 'commit.py'
--- commit.py	2011-03-23 16:05:18 +0000
+++ commit.py	2011-03-23 23:35:40 +0000
@@ -493,7 +493,7 @@
         self._svnprops = lazy_dict({}, dict,
             self._base_branch_props.iteritems())
         if push_metadata:
-            (self.set_custom_revprops, self.set_custom_fileprops) = self.repository._properties_to_set(self.mapping)
+            (self.set_custom_revprops, self.set_custom_fileprops) = self.repository._properties_to_set(self.mapping, config)
         else:
             self.set_custom_revprops = False
             self.set_custom_fileprops = False

=== modified file 'config.py'
--- config.py	2011-03-22 21:44:43 +0000
+++ config.py	2011-03-23 23:35:40 +0000
@@ -369,6 +369,15 @@
                 return value
         return None
 
+    def get_allow_metadata_in_fileprops(self):
+        """Check whether file properties may be used to store bzr-svn metadata.
+
+        """
+        try:
+            return self.get_bool("allow_metadata_in_file_properties")
+        except KeyError:
+            return False
+
     def get_append_revisions_only(self, default=None):
         """Check whether it is possible to remove revisions from the mainline.
         """

=== modified file 'errors.py'
--- errors.py	2011-03-15 00:32:10 +0000
+++ errors.py	2011-03-23 23:35:40 +0000
@@ -273,6 +273,11 @@
         BzrError.__init__(self, msg=msg)
 
 
+class RequiresMetadataInFileProps(BzrError):
+
+    _fmt = """This operation requires storing bzr-svn metadata in Subversion file properties. These file properties may cause spurious conflicts for other Subversion users during merges. To allow this, set `allow_metadata_in_file_properties = True` in your configuration and try again."""
+
+
 class TextChecksumMismatch(VersionedFileInvalidChecksum):
 
     _fmt = """checksum mismatch: %(expected_checksum)r != %(actual_checksum)r in %(path)s:%(revnum)d"""

=== modified file 'push.py'
--- push.py	2011-03-23 02:04:30 +0000
+++ push.py	2011-03-23 23:35:40 +0000
@@ -686,8 +686,10 @@
         if not mapping.supports_hidden:
             raise AssertionError("mapping format %r doesn't support hidden" %
                 mapping)
+        to_url = urlutils.join(repository.base, branch_path)
+        config = BranchConfig(to_url, repository.uuid)
         (set_custom_revprops,
-            set_custom_fileprops) = repository._properties_to_set(mapping)
+            set_custom_fileprops) = repository._properties_to_set(mapping, config)
         if set_custom_revprops:
             mapping.export_hidden_revprops(branch_path, revprops)
             if (not set_custom_fileprops and

=== modified file 'repository.py'
--- repository.py	2011-03-18 14:34:46 +0000
+++ repository.py	2011-03-23 23:35:40 +0000
@@ -574,7 +574,7 @@
             return mapping_registry.get(config_mapping_name)
         return mapping_registry.get_default()
 
-    def _properties_to_set(self, mapping):
+    def _properties_to_set(self, mapping, target_config):
         """Determine what sort of custom properties to set when
         committing a new round-tripped revision.
 
@@ -583,9 +583,14 @@
         """
         supports_custom_revprops = self.transport.has_capability("commit-revprops")
         if supports_custom_revprops and mapping.can_use_revprops:
-            return (True, mapping.must_use_fileprops)
+            use_revprops = True
+            use_fileprops = mapping.must_use_fileprops
         else:
-            return (False, mapping.can_use_fileprops)
+            use_revprops = False
+            use_fileprops = mapping.can_use_fileprops
+        if use_fileprops and not target_config.get_allow_metadata_in_fileprops():
+            raise errors.RequiresMetadataInFileProps()
+        return (use_revprops, use_fileprops)
 
     def get_mapping(self):
         """Get the default mapping that is used for this repository."""

=== modified file 'tests/mapping3/__init__.py'
--- tests/mapping3/__init__.py	2011-03-14 00:39:38 +0000
+++ tests/mapping3/__init__.py	2011-03-23 23:35:40 +0000
@@ -26,6 +26,12 @@
 from bzrlib.tests import TestCase
 from bzrlib.workingtree import WorkingTree
 
+from bzrlib.plugins.svn.config import (
+    BranchConfig,
+    )
+from bzrlib.plugins.svn.errors import (
+    RequiresMetadataInFileProps,
+    )
 from bzrlib.plugins.svn.layout.standard import (
     RootLayout,
     TrunkLayout,
@@ -459,6 +465,7 @@
     def test_commit_revision_id(self):
         self.make_checkout(self.repos_url, "dc")
         wt = WorkingTree.open("dc")
+        wt.branch.get_config().set_user_option("allow_metadata_in_file_properties", "True")
         self.build_tree({'dc/foo/bla': "data", 'dc/bla': "otherdata"})
         wt.add('bla')
         wt.commit(message="data")
@@ -474,13 +481,26 @@
             self.client_get_prop("dc", 
                 "bzr:revision-id:v3-none", 2))
 
+    def test_commit_metadata_requires_config_change(self):
+        self.make_checkout(self.repos_url, "dc")
+
+        wt = WorkingTree.open("dc")
+        self.build_tree({'dc/foo/bla': "data", 'dc/bla': "otherdata"})
+        wt.add('bla')
+        self.assertRaises(RequiresMetadataInFileProps, wt.commit,
+            message="data")
+        wt.branch.get_config().set_user_option("allow_metadata_in_file_properties", "True")
+        wt.commit(message="data")
+
     def test_commit_metadata(self):
         self.make_checkout(self.repos_url, "dc")
 
         wt = WorkingTree.open("dc")
         self.build_tree({'dc/foo/bla': "data", 'dc/bla': "otherdata"})
         wt.add('bla')
+        wt.branch.get_config().set_user_option("allow_metadata_in_file_properties", "True")
         wt.commit(message="data")
+
         branch = Branch.open(self.repos_url)
         builder = branch.get_commit_builder([branch.last_revision()], 
                 timestamp=4534.0, timezone=2, committer="fry",
@@ -502,6 +522,8 @@
         self.build_tree({'dc/foo/bla': "data"})
         self.client_add("dc/foo")
         wt = WorkingTree.open("dc")
+        wt.branch.get_config().set_user_option("allow_metadata_in_file_properties", "True")
+
         wt.set_pending_merges(["some-ghost-revision"])
         self.assertEqual(["some-ghost-revision"], wt.get_parent_ids()[1:])
         wt.commit(message="data")
@@ -525,6 +547,9 @@
 
         # Push first branch into Subversion
         newdir = BzrDir.open(repos_url+"/trunk")
+        config = BranchConfig(repos_url+"/trunk", newdir.find_repository().uuid)
+        config.set_user_option("allow_metadata_in_file_properties", "True")
+
         newbranch = newdir.import_branch(bzrwt.branch)
 
         c = ra.RemoteAccess(repos_url)