Patchwork [7,of,7] devel: use the new 'config' argument for the bookmark develwarn

login
register
mail settings
Submitter Pierre-Yves David
Date May 5, 2016, 5:05 p.m.
Message ID <e17c163682bc64afb9e6.1462467957@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/14929/
State Not Applicable
Headers show

Comments

Pierre-Yves David - May 5, 2016, 5:05 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1462457099 -7200
#      Thu May 05 16:04:59 2016 +0200
# Node ID e17c163682bc64afb9e60e4831587282fc2f4f45
# Parent  020642ebb270f0ec4d171b9b4425ace630798f65
# EXP-Topic develwarn
devel: use the new 'config' argument for the bookmark develwarn

Patch

diff -r 020642ebb270 -r e17c163682bc mercurial/bookmarks.py
--- a/mercurial/bookmarks.py	Thu May 05 16:04:40 2016 +0200
+++ b/mercurial/bookmarks.py	Thu May 05 16:04:59 2016 +0200
@@ -126,11 +126,10 @@  class bmstore(dict):
         if self._clean:
             return
         repo = self._repo
-        if (repo.ui.configbool('devel', 'all-warnings')
-                or repo.ui.configbool('devel', 'check-locks')):
-            l = repo._wlockref and repo._wlockref()
-            if l is None or not l.held:
-                repo.ui.develwarn('bookmarks write with no wlock')
+        l = repo._wlockref and repo._wlockref()
+        if l is None or not l.held:
+            repo.ui.develwarn('bookmarks write with no wlock',
+                              config='check-locks')
 
         tr = repo.currenttransaction()
         if tr: