Merge lp:~jelmer/brz/steal-dead-default into lp:brz

[Jelmer Vernooij]

Enable locks.steal_dead by default.

Enable locks.steal_dead by default.

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/434/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/440/

=== modified file 'breezy/config.py'
--- breezy/config.py	2019-06-26 20:41:57 +0000
+++ breezy/config.py	2019-07-07 18:18:57 +0000
@@ -2560,7 +2560,7 @@
     Option('language',
            help='Language to translate messages into.'))
 option_registry.register(
-    Option('locks.steal_dead', default=False, from_unicode=bool_from_store,
+    Option('locks.steal_dead', default=True, from_unicode=bool_from_store,
            help='''\
 Steal locks that appears to be dead.
 

=== modified file 'breezy/help_topics/en/configuration.txt'
--- breezy/help_topics/en/configuration.txt	2018-11-08 03:33:22 +0000
+++ breezy/help_topics/en/configuration.txt	2019-07-07 18:18:57 +0000
@@ -527,8 +527,8 @@
 locks.steal_dead
 ~~~~~~~~~~~~~~~~
 
-If set to true, bzr will automatically break locks held by processes from
-the same machine and user that are no longer alive.  Otherwise, it will
+By default, bzr will automatically break locks held by processes from
+the same machine and user that are no longer alive.  If disabled, it will
 print a message and you can break the lock manually, if you are satisfied
 the object is no longer in use.
 

=== modified file 'breezy/tests/test_lockdir.py'
--- breezy/tests/test_lockdir.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_lockdir.py	2019-07-07 18:18:57 +0000
@@ -735,9 +735,7 @@
         """
         self.overrideAttr(lockdir, 'get_host_name',
                           lambda: 'aproperhostname')
-        # This is off by default at present; see the discussion in the bug.
-        # If you change the default, don't forget to update the docs.
-        config.GlobalStack().set('locks.steal_dead', True)
+        # Stealing dead locks is enabled by default.
         # Create a lock pretending to come from a different nonexistent
         # process on the same machine.
         l1 = LockDir(self.get_transport(), 'a',
@@ -754,10 +752,12 @@
         """Automatic breaking can be turned off"""
         l1 = LockDir(self.get_transport(), 'a',
                      extra_holder_info={'pid': '12312313'})
+        # Stealing dead locks is enabled by default, so disable it.
+        config.GlobalStack().set('locks.steal_dead', False)
         token_1 = l1.attempt_lock()
         self.addCleanup(l1.unlock)
         l2 = LockDir(self.get_transport(), 'a')
-        # This fails now, because dead lock breaking is off by default.
+        # This fails now, because dead lock breaking is disabled.
         self.assertRaises(LockContention,
                           l2.attempt_lock)
         # and it's in fact not broken

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-07-07 18:00:25 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-07-07 18:18:57 +0000
@@ -54,6 +54,9 @@
 * Automatically upgrade to branch format 8 when setting branch references.
   (Jelmer Vernooij)
 
+* ``locks.steal_dead`` is now enabled by default.
+  (Jelmer Vernooij, #220464)
+
 * The substitution variables for the ``change_editor`` configuration
   option are now "{old_path}" and "{new_path}" rather than "@old_path" and
   "@new_path". The former is more consistent with the way substitutions