This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12616

debuglock: make the command more useful in non-interactive mode
ClosedPublic

Authored by marmoute on Fri, May 6, 4:37 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG883be4c74d54: debuglock: make the command more useful in non-interactive mode
Summary

The existing prompt mode simply release the lock immediately in non-interactive
mode. That is quite useless in the test so now the non-interactive mode simply
wait for a signal.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Fri, May 6, 4:37 AM
baymax edited the summary of this revision. (Show Details)Thu, May 19, 6:36 AM
baymax updated this revision to Diff 33414.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Tue, May 24, 9:34 AM
This revision is now accepted and ready to land.Tue, May 24, 9:34 AM
baymax updated this revision to Diff 33429.Tue, May 24, 10:33 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (14 lines)

Diff 33439

mercurial/debugcommands.py

except error.LockHeld: except error.LockHeld:
raise error.Abort(_(b'wlock is already held')) raise error.Abort(_(b'wlock is already held'))
if opts.get('set_lock'): if opts.get('set_lock'):
try: try:
locks.append(repo.lock(False)) locks.append(repo.lock(False))
except error.LockHeld: except error.LockHeld:
raise error.Abort(_(b'lock is already held')) raise error.Abort(_(b'lock is already held'))
if len(locks): if len(locks):
ui.promptchoice(_(b"ready to release the lock (y)? $$ &Yes")) try:
if ui.interactive():
prompt = _(b"ready to release the lock (y)? $$ &Yes")
ui.promptchoice(prompt)
else:
msg = b"%d locks held, waiting for signal\n"
msg %= len(locks)
ui.status(msg)
while True: # XXX wait for a signal
time.sleep(0.1)
except KeyboardInterrupt:
msg = b"signal-received releasing locks\n"
ui.status(msg)
return 0 return 0
finally: finally:
release(*locks) release(*locks)
now = time.time() now = time.time()
held = 0 held = 0
def report(vfs, name, method): def report(vfs, name, method):