Show More
@@ -926,7 +926,7 class localrepository(object): | |||||
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 |
|
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() | |
@@ -1216,7 +1216,7 class localrepository(object): | |||||
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" |
|
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(): |
@@ -177,7 +177,7 def develwarn(tui, msg): | |||||
177 | if tui.tracebackflag: |
|
177 | if tui.tracebackflag: | |
178 | util.debugstacktrace(msg, 2) |
|
178 | util.debugstacktrace(msg, 2) | |
179 | else: |
|
179 | else: | |
180 | tui.write_err(msg) |
|
180 | tui.write_err(msg + '\n') | |
181 |
|
181 | |||
182 | def filteredhash(repo, maxrev): |
|
182 | def filteredhash(repo, maxrev): | |
183 | """build hash of filtered revisions in the current repoview. |
|
183 | """build hash of filtered revisions in the current repoview. |
@@ -54,8 +54,7 | |||||
54 | transaction with no lock |
|
54 | transaction with no lock | |
55 | "wlock" acquired after "lock" |
|
55 | "wlock" acquired after "lock" | |
56 | $ hg buggylocking --traceback |
|
56 | $ hg buggylocking --traceback | |
57 | transaction with no lock |
|
57 | transaction with no lock at: | |
58 | at: |
|
|||
59 | */hg:* in * (glob) |
|
58 | */hg:* in * (glob) | |
60 | */mercurial/dispatch.py:* in run (glob) |
|
59 | */mercurial/dispatch.py:* in run (glob) | |
61 | */mercurial/dispatch.py:* in dispatch (glob) |
|
60 | */mercurial/dispatch.py:* in dispatch (glob) | |
@@ -67,8 +66,7 | |||||
67 | */mercurial/dispatch.py:* in <lambda> (glob) |
|
66 | */mercurial/dispatch.py:* in <lambda> (glob) | |
68 | */mercurial/util.py:* in check (glob) |
|
67 | */mercurial/util.py:* in check (glob) | |
69 | $TESTTMP/buggylocking.py:* in buggylocking (glob) |
|
68 | $TESTTMP/buggylocking.py:* in buggylocking (glob) | |
70 | "wlock" acquired after "lock" |
|
69 | "wlock" acquired after "lock" at: | |
71 | at: |
|
|||
72 | */hg:* in * (glob) |
|
70 | */hg:* in * (glob) | |
73 | */mercurial/dispatch.py:* in run (glob) |
|
71 | */mercurial/dispatch.py:* in run (glob) | |
74 | */mercurial/dispatch.py:* in dispatch (glob) |
|
72 | */mercurial/dispatch.py:* in dispatch (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now