Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 44877:a9ff0742c8ea
locking: wait for locks in `hg cp` and `hg mv`
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.
Differential Revision: https://phab.mercurial-scm.org/D8464
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Tue, 21 Apr 2020 13:37:45 -0700 |
| parents | 16c361152133 |
| children | aac816f584ad |
comparison
equal
deleted
inserted
replaced
| 44876:ea9563e9e65a | 44877:a9ff0742c8ea |
|---|---|
| 2348 This command takes effect with the next commit by default. | 2348 This command takes effect with the next commit by default. |
| 2349 | 2349 |
| 2350 Returns 0 on success, 1 if errors are encountered. | 2350 Returns 0 on success, 1 if errors are encountered. |
| 2351 """ | 2351 """ |
| 2352 opts = pycompat.byteskwargs(opts) | 2352 opts = pycompat.byteskwargs(opts) |
| 2353 with repo.wlock(False): | 2353 with repo.wlock(): |
| 2354 return cmdutil.copy(ui, repo, pats, opts) | 2354 return cmdutil.copy(ui, repo, pats, opts) |
| 2355 | 2355 |
| 2356 | 2356 |
| 2357 @command( | 2357 @command( |
| 2358 b'debugcommands', | 2358 b'debugcommands', |
| 5805 before that, see :hg:`revert`. | 5805 before that, see :hg:`revert`. |
| 5806 | 5806 |
| 5807 Returns 0 on success, 1 if errors are encountered. | 5807 Returns 0 on success, 1 if errors are encountered. |
| 5808 """ | 5808 """ |
| 5809 opts = pycompat.byteskwargs(opts) | 5809 opts = pycompat.byteskwargs(opts) |
| 5810 with repo.wlock(False): | 5810 with repo.wlock(): |
| 5811 return cmdutil.copy(ui, repo, pats, opts, rename=True) | 5811 return cmdutil.copy(ui, repo, pats, opts, rename=True) |
| 5812 | 5812 |
| 5813 | 5813 |
| 5814 @command( | 5814 @command( |
| 5815 b'resolve', | 5815 b'resolve', |