Rev 4533: Update the various documentation and use strict_locks instead of strict-locks. in lp:///~jameinel/bzr/1.18-lock-warnings

[John Arbash Meinel]

At lp:///~jameinel/bzr/1.18-lock-warnings

------------------------------------------------------------
revno: 4533
revision-id: john at arbash-meinel.com-20090731155252-0r61x61q1ct6iv0f
parent: john at arbash-meinel.com-20090731154925-fquqoz209bh9aabr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-lock-warnings
timestamp: Fri 2009-07-31 10:52:52 -0500
message:
  Update the various documentation and use strict_locks instead of strict-locks.
  This conforms a bit better to the only other multi-word setting -Dallow_debug.
-------------- next part --------------
=== modified file 'bzrlib/help_topics/en/debug-flags.txt'
--- a/bzrlib/help_topics/en/debug-flags.txt	2009-07-30 20:44:21 +0000
+++ b/bzrlib/help_topics/en/debug-flags.txt	2009-07-31 15:52:52 +0000
@@ -21,7 +21,7 @@
 -Dhttp            Trace http connections, requests and responses.
 -Dindex           Trace major index operations.
 -Dknit            Trace knit operations.
--Dlock            Trace when OS locks are potentially used in a non-portable
+-Dstrict_locks    Trace when OS locks are potentially used in a non-portable
                   manner.
 -Dmerge           Emit information for debugging merges.
 -Dunlock          Some errors during unlock are treated as warnings.

=== modified file 'bzrlib/lock.py'
--- a/bzrlib/lock.py	2009-07-31 15:49:25 +0000
+++ b/bzrlib/lock.py	2009-07-31 15:52:52 +0000
@@ -191,7 +191,7 @@
                 self._clear_f()
                 raise errors.LockContention(self.filename)
             if self.filename in _fcntl_ReadLock._open_locks:
-                if 'strict-locks' in debug.debug_flags:
+                if 'strict_locks' in debug.debug_flags:
                     self._clear_f()
                     raise errors.LockContention(self.filename)
                 else:
@@ -228,7 +228,7 @@
             super(_fcntl_ReadLock, self).__init__()
             self.filename = osutils.realpath(filename)
             if self.filename in _fcntl_WriteLock._open_locks:
-                if 'strict-locks' in debug.debug_flags:
+                if 'strict_locks' in debug.debug_flags:
                     raise errors.LockContention(self.filename)
                 else:
                     trace.mutter('Read lock taken w/ an open write lock on: %s'

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-07-31 15:49:25 +0000
+++ b/bzrlib/tests/__init__.py	2009-07-31 15:52:52 +0000
@@ -831,7 +831,7 @@
         if 'allow_debug' not in selftest_debug_flags:
             debug.debug_flags.clear()
         # if 'disable_lock_checks' not in selftest_debug_flags:
-        #     debug.debug_flags.add('strict-locks')
+        #     debug.debug_flags.add('strict_locks')
         self.addCleanup(self._restore_debug_flags)
 
     def _clear_hooks(self):