Mercurial > hg

changeset 44274:87167caa2989

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lfs: enable workers by default With the stall issue seemingly fixed, there's no reason not to use workers. The setting is left for now to keep the test output deterministic, and in case other issues come up. If none do, this can be converted to a developer setting for usage with the tests. Differential Revision: https://phab.mercurial-scm.org/D7963
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 21 Jan 2020 11:40:15 -0500
parents 43eea17ae7b3
children 66dab0d9a78e
files hgext/lfs/TODO.rst hgext/lfs/__init__.py tests/test-lfs-serve-access.t tests/test-lfs-serve.t tests/test-lfs-test-server.t
diffstat 5 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/lfs/TODO.rst	Tue Jan 21 11:32:33 2020 -0500
+++ b/hgext/lfs/TODO.rst	Tue Jan 21 11:40:15 2020 -0500
@@ -38,9 +38,6 @@
 
    * `hg diff` is similar, and probably shouldn't see the pointer file
 
-#. `Fix https multiplexing, and re-enable workers
-   <https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-January/109916.html>`_.
-
 #. Show to-be-applied rules with `hg files -r 'wdir()' 'set:lfs()'`
 
    * `debugignore` can show file + line number, so a dedicated command could be
--- a/hgext/lfs/__init__.py	Tue Jan 21 11:32:33 2020 -0500
+++ b/hgext/lfs/__init__.py	Tue Jan 21 11:40:15 2020 -0500
@@ -181,7 +181,7 @@
     b'experimental', b'lfs.disableusercache', default=False,
 )
 eh.configitem(
-    b'experimental', b'lfs.worker-enable', default=False,
+    b'experimental', b'lfs.worker-enable', default=True,
 )
 
 eh.configitem(
--- a/tests/test-lfs-serve-access.t	Tue Jan 21 11:32:33 2020 -0500
+++ b/tests/test-lfs-serve-access.t	Tue Jan 21 11:40:15 2020 -0500
@@ -17,6 +17,7 @@
   $ hg init server
   $ hg --config "lfs.usercache=$TESTTMP/servercache" \
   >    --config experimental.lfs.serve=False -R server serve -d \
+  >    --config experimental.lfs.worker-enable=False \
   >    -p $HGPORT --pid-file=hg.pid -A $TESTTMP/access.log -E $TESTTMP/errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
--- a/tests/test-lfs-serve.t	Tue Jan 21 11:32:33 2020 -0500
+++ b/tests/test-lfs-serve.t	Tue Jan 21 11:40:15 2020 -0500
@@ -65,6 +65,7 @@
   > debugprocessors = $TESTTMP/debugprocessors.py
   > [experimental]
   > lfs.disableusercache = True
+  > lfs.worker-enable = False
   > [lfs]
   > threshold=10
   > [web]
--- a/tests/test-lfs-test-server.t	Tue Jan 21 11:32:33 2020 -0500
+++ b/tests/test-lfs-test-server.t	Tue Jan 21 11:40:15 2020 -0500
@@ -40,6 +40,8 @@
 #endif
 
   $ cat >> $HGRCPATH <<EOF
+  > [experimental]
+  > lfs.worker-enable = False
   > [extensions]
   > lfs=
   > [lfs]