Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
locking: wait for locks in `hg cp` and `hg mv`
authorKyle Lippincott <spectral@google.com>
Tue, 21 Apr 2020 13:37:45 -0700
changeset 44877 a9ff0742c8ea
parent 44876 ea9563e9e65a
child 44878 373dd22ae60e
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
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Tue Apr 14 05:37:54 2020 +0200
+++ b/mercurial/commands.py	Tue Apr 21 13:37:45 2020 -0700
@@ -2350,7 +2350,7 @@
     Returns 0 on success, 1 if errors are encountered.
     """
     opts = pycompat.byteskwargs(opts)
-    with repo.wlock(False):
+    with repo.wlock():
         return cmdutil.copy(ui, repo, pats, opts)
 
 
@@ -5807,7 +5807,7 @@
     Returns 0 on success, 1 if errors are encountered.
     """
     opts = pycompat.byteskwargs(opts)
-    with repo.wlock(False):
+    with repo.wlock():
         return cmdutil.copy(ui, repo, pats, opts, rename=True)
hg-stable