Show More
@@ -207,7 +207,6 b' from mercurial import (' | |||||
207 | exchange, |
|
207 | exchange, | |
208 | extensions, |
|
208 | extensions, | |
209 | hg, |
|
209 | hg, | |
210 | lock, |
|
|||
211 | logcmdutil, |
|
210 | logcmdutil, | |
212 | merge as mergemod, |
|
211 | merge as mergemod, | |
213 | mergeutil, |
|
212 | mergeutil, | |
@@ -225,7 +224,6 b' from mercurial.utils import (' | |||||
225 | ) |
|
224 | ) | |
226 |
|
225 | |||
227 | pickle = util.pickle |
|
226 | pickle = util.pickle | |
228 | release = lock.release |
|
|||
229 | cmdtable = {} |
|
227 | cmdtable = {} | |
230 | command = registrar.command(cmdtable) |
|
228 | command = registrar.command(cmdtable) | |
231 |
|
229 | |||
@@ -1601,12 +1599,10 b' def histedit(ui, repo, *freeargs, **opts' | |||||
1601 |
|
1599 | |||
1602 | def _texthistedit(ui, repo, *freeargs, **opts): |
|
1600 | def _texthistedit(ui, repo, *freeargs, **opts): | |
1603 | state = histeditstate(repo) |
|
1601 | state = histeditstate(repo) | |
1604 | try: |
|
1602 | with repo.wlock() as wlock, repo.lock() as lock: | |
1605 |
state.wlock = |
|
1603 | state.wlock = wlock | |
1606 |
state.lock = |
|
1604 | state.lock = lock | |
1607 | _histedit(ui, repo, state, *freeargs, **opts) |
|
1605 | _histedit(ui, repo, state, *freeargs, **opts) | |
1608 | finally: |
|
|||
1609 | release(state.lock, state.wlock) |
|
|||
1610 |
|
1606 | |||
1611 | goalcontinue = 'continue' |
|
1607 | goalcontinue = 'continue' | |
1612 | goalabort = 'abort' |
|
1608 | goalabort = 'abort' |
General Comments 0
You need to be logged in to leave comments.
Login now