wlock: do not warn for non-wait locking

We are warning about lock acquired in the wrong order because this can create
dead-lock situation. But non-wait acquisition will not block and therefore not
create a dead-lock. So we do not need to wait in such case.

mercurial/localrepo.py

@@ -1212,8 +1212,10 b' class localrepository(object):'
             l.lock()
             return l
 
-        if (self.ui.configbool('devel', 'all')
-                or self.ui.configbool('devel', 'check-locks')):
+        # We do not need to check for non-waiting lock aquisition.  Such
+        # acquisition would not cause dead-lock as they would just fail.
+        if wait and (self.ui.configbool('devel', 'all')
+                     or self.ui.configbool('devel', 'check-locks')):
             l = self._lockref and self._lockref()
             if l is not None and l.held:
                 scmutil.develwarn(self.ui, '"wlock" acquired after "lock"')

tests/test-devel-warnings.t

@@ -31,6 +31,13 b''
   >     tr.close()
   >     lo.release()
   >     wl.release()
+  > 
+  > @command('nowaitlocking', [], '')
+  > def nowaitlocking(ui, repo):
+  >     lo = repo.lock()
+  >     wl = repo.wlock(wait=False)
+  >     wl.release()
+  >     lo.release()
   > EOF
 
   $ cat << EOF >> $HGRCPATH
@@ -79,4 +86,5 b''
    */mercurial/util.py:* in check (glob)
    $TESTTMP/buggylocking.py:* in buggylocking (glob)
   $ hg properlocking
+  $ hg nowaitlocking
   $ cd ..