Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 24748:d6caadff4779

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
develwarn: handle the end of line inside the function itself The traceback version should not have a end of line at all. The non-traceback version will requires the same things soon.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 12 Apr 2015 14:26:11 -0400
parents bef8b17443a3
children aaf835407bf2
comparison
equal deleted inserted replaced
24747:bef8b17443a3 24748:d6caadff4779
924 def transaction(self, desc, report=None): 924 def transaction(self, desc, report=None):
925 if (self.ui.configbool('devel', 'all') 925 if (self.ui.configbool('devel', 'all')
926 or self.ui.configbool('devel', 'check-locks')): 926 or self.ui.configbool('devel', 'check-locks')):
927 l = self._lockref and self._lockref() 927 l = self._lockref and self._lockref()
928 if l is None or not l.held: 928 if l is None or not l.held:
929 scmutil.develwarn(self.ui, 'transaction with no lock\n') 929 scmutil.develwarn(self.ui, 'transaction with no lock')
930 tr = self.currenttransaction() 930 tr = self.currenttransaction()
931 if tr is not None: 931 if tr is not None:
932 return tr.nest() 932 return tr.nest()
933 933
934 # abort here if the journal already exists 934 # abort here if the journal already exists
1214 1214
1215 if (self.ui.configbool('devel', 'all') 1215 if (self.ui.configbool('devel', 'all')
1216 or self.ui.configbool('devel', 'check-locks')): 1216 or self.ui.configbool('devel', 'check-locks')):
1217 l = self._lockref and self._lockref() 1217 l = self._lockref and self._lockref()
1218 if l is not None and l.held: 1218 if l is not None and l.held:
1219 scmutil.develwarn(self.ui, '"wlock" acquired after "lock"\n') 1219 scmutil.develwarn(self.ui, '"wlock" acquired after "lock"')
1220 1220
1221 def unlock(): 1221 def unlock():
1222 if self.dirstate.pendingparentchange(): 1222 if self.dirstate.pendingparentchange():
1223 self.dirstate.invalidate() 1223 self.dirstate.invalidate()
1224 else: 1224 else: