Mercurial > hg
comparison mercurial/localrepo.py @ 24745:bc34b286781f
wlock: reword the devel warning
We change the wording of the developer warning:
- "lock" taken before "wlock"
+ "wlock" acquired after "lock"
The goals here are to:
- Put the "subject" as the first word,
- use "acquired" instead of "taken" since it seems more accurate.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Sun, 12 Apr 2015 13:28:35 -0400 |
parents | bedefc611f25 |
children | e0c810d0ab69 |
comparison
equal
deleted
inserted
replaced
24744:bedefc611f25 | 24745:bc34b286781f |
---|---|
1211 | 1211 |
1212 if (self.ui.configbool('devel', 'all') | 1212 if (self.ui.configbool('devel', 'all') |
1213 or self.ui.configbool('devel', 'check-locks')): | 1213 or self.ui.configbool('devel', 'check-locks')): |
1214 l = self._lockref and self._lockref() | 1214 l = self._lockref and self._lockref() |
1215 if l is not None and l.held: | 1215 if l is not None and l.held: |
1216 msg = '"lock" taken before "wlock"\n' | 1216 msg = '"wlock" acquired after "lock"\n' |
1217 if self.ui.tracebackflag: | 1217 if self.ui.tracebackflag: |
1218 util.debugstacktrace(msg, 1) | 1218 util.debugstacktrace(msg, 1) |
1219 else: | 1219 else: |
1220 self.ui.write_err(msg) | 1220 self.ui.write_err(msg) |
1221 | 1221 |