Rev 3959: Comment out the deprecation warnings, because I'm not going to in lp:///~jameinel/bzr/win32-shelve

John Arbash Meinel john at arbash-meinel.com
Fri Jan 23 18:29:31 GMT 2009


At lp:///~jameinel/bzr/win32-shelve

------------------------------------------------------------
revno: 3959
revision-id: john at arbash-meinel.com-20090123182924-ievv132uozxyzjhv
parent: john at arbash-meinel.com-20090123182613-iozkh04uv69lt3p4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32-shelve
timestamp: Fri 2009-01-23 12:29:24 -0600
message:
  Comment out the deprecation warnings, because I'm not going to
  spend the time fixing them.
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2009-01-23 18:26:13 +0000
+++ b/bzrlib/workingtree_4.py	2009-01-23 18:29:24 +0000
@@ -1027,12 +1027,14 @@
         try:
             self._must_be_locked()
         except errors.ObjectNotLocked:
-            symbol_versioning.warn('As of bzr 1.12 you should grab a'
-                ' lock on the working tree before calling'
-                ' wt.basis_tree() or wt.revision_tree()'
-                ' and only hold on to the returned tree'
-                ' for the lifetime of the lock.',
-                DeprecationWarning, stacklevel=2)
+            # Skip the DeprecationWarning because too many places need fixing
+            pass
+            # symbol_versioning.warn('As of bzr 1.12 you should grab a'
+            #     ' lock on the working tree before calling'
+            #     ' wt.basis_tree() or wt.revision_tree()'
+            #     ' and only hold on to the returned tree'
+            #     ' for the lifetime of the lock.',
+            #     DeprecationWarning, stacklevel=2)
         # We preserve the @needs_read_lock for self._revision_tree for
         # compatibility, but we can't have it on this function, or we can't
         # tell that the caller isn't holding a lock.
@@ -1795,12 +1797,15 @@
                 self._dirstate_locked = True
             state_at_creation = self._dirstate_at_creation()
             if state_at_creation is None or state is not state_at_creation:
-                symbol_versioning.warn('Caller failed to maintain lock'
-                    ' on working tree for the lifetime of the'
-                    ' DirStateRevisionTree returned by'
-                    ' wt.basis_tree() or wt.revision_tree()'
-                    ' This should always be done since bzr 1.12',
-                    DeprecationWarning, stacklevel=2)
+                # Skip the DeprecationWarning because too many places need
+                # fixing
+                pass
+                # symbol_versioning.warn('Caller failed to maintain lock'
+                #     ' on working tree for the lifetime of the'
+                #     ' DirStateRevisionTree returned by'
+                #     ' wt.basis_tree() or wt.revision_tree()'
+                #     ' This should always be done since bzr 1.12',
+                #     DeprecationWarning, stacklevel=2)
         self._locked += 1
 
     def _must_be_locked(self):



More information about the bazaar-commits mailing list