This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9690

debuglock: rename flag names to better clarity
ClosedPublic

Authored by pulkit on Jan 8 2021, 8:49 AM.

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbc884e31b8c8: debuglock: rename flag names to better clarity
Summary

--force-lock sounds as if we are taking the lock however in reality it's the
opposite.

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

pulkit created this revision.Jan 8 2021, 8:49 AM
marmoute accepted this revision.Jan 8 2021, 6:13 PM
marmoute added a subscriber: marmoute.

The current name are semantically correct, as "opening a lock without the key" is "forcing a lock". However I agree the new names are clearer in the context of Mercurial and for non-native speaker.

baymax updated this revision to Diff 24695.Jan 9 2021, 8:03 AM

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

Alphare accepted this revision.Jan 12 2021, 11:28 AM
Alphare added a subscriber: Alphare.

Agreed, this is clearer.

pulkit updated this revision to Diff 24777.Jan 13 2021, 6:30 AM
pulkit added a commit: rHGbc884e31b8c8: debuglock: rename flag names to better clarity.Jan 13 2021, 2:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGbc884e31b8c8: debuglock: rename flag names to better clarity (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (10 lines)
Mrelnotes/next (2 lines)
Mtests/test-completion.t (2 lines)

Diff 24796

mercurial/debugcommands.py

def debuglabelcomplete(ui, repo, *args): def debuglabelcomplete(ui, repo, *args):
'''backwards compatibility with old bash completion scripts (DEPRECATED)''' '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
debugnamecomplete(ui, repo, *args) debugnamecomplete(ui, repo, *args)
@command( @command(
b'debuglocks', b'debuglocks',
[ [
(b'L', b'force-lock', None, _(b'free the store lock (DANGEROUS)')), (b'L', b'force-free-lock', None, _(b'free the store lock (DANGEROUS)')),
( (
b'W', b'W',
b'force-wlock', b'force-free-wlock',
None, None,
_(b'free the working state lock (DANGEROUS)'), _(b'free the working state lock (DANGEROUS)'),
), ),
(b's', b'set-lock', None, _(b'set the store lock until stopped')), (b's', b'set-lock', None, _(b'set the store lock until stopped')),
( (
b'S', b'S',
b'set-wlock', b'set-wlock',
None, None,
Setting a lock will prevent other commands from changing the data. Setting a lock will prevent other commands from changing the data.
The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs. The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs.
The set locks are removed when the command exits. The set locks are removed when the command exits.
Returns 0 if no locks are held. Returns 0 if no locks are held.
""" """
if opts.get('force_lock'): if opts.get('force_free_lock'):
repo.svfs.unlink(b'lock') repo.svfs.unlink(b'lock')
if opts.get('force_wlock'): if opts.get('force_free_wlock'):
repo.vfs.unlink(b'wlock') repo.vfs.unlink(b'wlock')
if opts.get('force_lock') or opts.get('force_wlock'): if opts.get('force_free_lock') or opts.get('force_free_wlock'):
return 0 return 0
locks = [] locks = []
try: try:
if opts.get('set_wlock'): if opts.get('set_wlock'):
try: try:
locks.append(repo.wlock(False)) locks.append(repo.wlock(False))
except error.LockHeld: except error.LockHeld:

relnotes/next

== Bug Fixes == == Bug Fixes ==
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
* `--force-lock` and `--force-wlock` options on `hg debuglock` command are
renamed to `--force-free-lock` and `--force-free-wlock` respectively.
== Internal API Changes == == Internal API Changes ==

tests/test-completion.t

debuggetbundle: head, common, type debuggetbundle: head, common, type
debugignore: debugignore:
debugindex: changelog, manifest, dir, template debugindex: changelog, manifest, dir, template
debugindexdot: changelog, manifest, dir debugindexdot: changelog, manifest, dir
debugindexstats: debugindexstats:
debuginstall: template debuginstall: template
debugknown: debugknown:
debuglabelcomplete: debuglabelcomplete:
debuglocks: force-lock, force-wlock, set-lock, set-wlock debuglocks: force-free-lock, force-free-wlock, set-lock, set-wlock
debugmanifestfulltextcache: clear, add debugmanifestfulltextcache: clear, add
debugmergestate: style, template debugmergestate: style, template
debugnamecomplete: debugnamecomplete:
debugnodemap: dump-new, dump-disk, check, metadata debugnodemap: dump-new, dump-disk, check, metadata
debugobsolete: flags, record-parents, rev, exclusive, index, delete, date, user, template debugobsolete: flags, record-parents, rev, exclusive, index, delete, date, user, template
debugp1copies: rev debugp1copies: rev
debugp2copies: rev debugp2copies: rev
debugpathcomplete: full, normal, added, removed debugpathcomplete: full, normal, added, removed