Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 25629:52e5f68d8363

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
devel-warn: move the develwarn function as a method of the ui object We are going to use this feature in more and more place. Having to import scmutil makes it an import cycle hell.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 19 Jun 2015 11:19:45 -0700
parents ce9e231265c1
children 328739ea70c3
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu Jun 18 23:08:27 2015 +0900
+++ b/mercurial/localrepo.py	Fri Jun 19 11:19:45 2015 -0700
@@ -953,7 +953,7 @@
                 or self.ui.configbool('devel', 'check-locks')):
             l = self._lockref and self._lockref()
             if l is None or not l.held:
-                scmutil.develwarn(self.ui, 'transaction with no lock')
+                self.ui.develwarn('transaction with no lock')
         tr = self.currenttransaction()
         if tr is not None:
             return tr.nest()
@@ -1258,7 +1258,7 @@
                      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"')
+                self.ui.develwarn('"wlock" acquired after "lock"')
 
         def unlock():
             if self.dirstate.pendingparentchange():