This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8464

locking: wait for locks in `hg cp` and `hg mv`
ClosedPublic

Authored by spectral on Apr 21 2020, 4:49 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGa9ff0742c8ea: locking: wait for locks in `hg cp` and `hg mv`
Summary

I traced this back to revision 1822 (64df422), and there's no explanation why we
would prefer to error out instead of waiting for the locks.

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

spectral created this revision.Apr 21 2020, 4:49 PM
marmoute accepted this revision.Apr 22 2020, 3:57 AM
marmoute added a subscriber: marmoute.

Maybe because you can't be sure the situation will be the same as the one before you ran the command ? However, normal race condition could still happens so that would not seems like a strong enough reason ? With the current code coverning the full command execution, I feel like this change is fine.

spectral added a commit: rHGa9ff0742c8ea: locking: wait for locks in `hg cp` and `hg mv`.May 7 2020, 2:20 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGa9ff0742c8ea: locking: wait for locks in `hg cp` and `hg mv` (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (4 lines)

Diff 21307

mercurial/commands.py

all given (positional) arguments are unmarked as copies. The destination all given (positional) arguments are unmarked as copies. The destination
file(s) will be left in place (still tracked). file(s) will be left in place (still tracked).
This command takes effect with the next commit by default. This command takes effect with the next commit by default.
Returns 0 on success, 1 if errors are encountered. Returns 0 on success, 1 if errors are encountered.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
with repo.wlock(False): with repo.wlock():
return cmdutil.copy(ui, repo, pats, opts) return cmdutil.copy(ui, repo, pats, opts)
@command( @command(
b'debugcommands', b'debugcommands',
[], [],
_(b'[COMMAND]'), _(b'[COMMAND]'),
helpcategory=command.CATEGORY_HELP, helpcategory=command.CATEGORY_HELP,
operation is recorded, but no copying is performed. operation is recorded, but no copying is performed.
This command takes effect at the next commit. To undo a rename This command takes effect at the next commit. To undo a rename
before that, see :hg:`revert`. before that, see :hg:`revert`.
Returns 0 on success, 1 if errors are encountered. Returns 0 on success, 1 if errors are encountered.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
with repo.wlock(False): with repo.wlock():
return cmdutil.copy(ui, repo, pats, opts, rename=True) return cmdutil.copy(ui, repo, pats, opts, rename=True)
@command( @command(
b'resolve', b'resolve',
[ [
(b'a', b'all', None, _(b'select all unresolved files')), (b'a', b'all', None, _(b'select all unresolved files')),
(b'l', b'list', None, _(b'list state of files needing merge')), (b'l', b'list', None, _(b'list state of files needing merge')),