Rev 1623: Remove set-revprops option. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1623
revision-id: jelmer at samba.org-20080823201849-mcwgp3nmgyq4amxv
parent: jelmer at samba.org-20080823183903-m1099pb8jx02z3gp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-23 22:18:49 +0200
message:
  Remove set-revprops option.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  config.py                      config.py-20070624185721-0j8f1ly75uo4s1lk-1
  tests/test_config.py           test_config.py-20070624193244-itvnst60evjidr4z-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
=== modified file 'commit.py'
--- a/commit.py	2008-08-23 14:55:24 +0000
+++ b/commit.py	2008-08-23 20:18:49 +0000
@@ -426,7 +426,6 @@
         bp_parts = bp.split("/")
         repository_latest_revnum = self.repository.get_latest_revnum()
         lock = self.repository.transport.lock_write(".")
-        set_revprops = self._config.get_set_revprops()
 
         # Store file ids
         def _dir_process_file_id(old_inv, new_inv, path, file_id):
@@ -485,8 +484,6 @@
                         self._svn_revprops, done, None, False)
                 self._svn_revprops = {}
             else:
-                if set_revprops:
-                    raise
                 # Try without bzr: revprops
                 self.editor = self.repository.transport.get_commit_editor({
                     properties.PROP_REVISION_LOG: self._svn_revprops[properties.PROP_REVISION_LOG]},

=== modified file 'config.py'
--- a/config.py	2008-08-04 16:37:35 +0000
+++ b/config.py	2008-08-23 20:18:49 +0000
@@ -95,14 +95,6 @@
             return BranchingScheme.find_scheme(schemename.encode('ascii'))
         return None
 
-    def get_set_revprops(self):
-        """Check whether or not bzr-svn should attempt to store Bazaar
-        revision properties in Subversion revision properties during commit."""
-        try:
-            return self._get_parser().get_bool(self.uuid, "set-revprops")
-        except KeyError:
-            return None
-
     def get_supports_change_revprop(self):
         """Check whether or not the repository supports changing existing 
         revision properties."""
@@ -222,9 +214,6 @@
             self._repository_config = SvnRepositoryConfig(self.branch.repository.uuid)
         return self._repository_config
 
-    def get_set_revprops(self):
-        return self._get_repository_config().get_set_revprops()
-
     def get_log_strip_trailing_newline(self):
         return self._get_repository_config().get_log_strip_trailing_newline()
 

=== modified file 'tests/test_config.py'
--- a/tests/test_config.py	2008-08-23 17:55:26 +0000
+++ b/tests/test_config.py	2008-08-23 20:18:49 +0000
@@ -82,14 +82,6 @@
         c.set_user_option("append_revisions_only", "False")
         self.assertEquals(False, c.get_append_revisions_only())
 
-    def test_set_revprops(self):
-        c = SvnRepositoryConfig("blabla2")
-        self.assertEquals(None, c.get_set_revprops())
-        c.set_user_option("set-revprops", "True")
-        self.assertEquals(True, c.get_set_revprops())
-        c.set_user_option("set-revprops", "False")
-        self.assertEquals(False, c.get_set_revprops())
-
     def test_log_strip_trailing_newline(self):
         c = SvnRepositoryConfig("blabla3")
         self.assertEquals(False, c.get_log_strip_trailing_newline())

=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py	2008-08-23 15:38:17 +0000
+++ b/tests/test_workingtree.py	2008-08-23 20:18:49 +0000
@@ -18,6 +18,7 @@
 """Working tree tests."""
 
 from bzrlib.branch import Branch
+from bzrlib.bzrdir import BzrDir
 from bzrlib.errors import NoSuchFile, OutOfDateTree
 from bzrlib.inventory import Inventory
 from bzrlib.osutils import has_symlinks, supports_executable