Patchwork D7963: lfs: enable workers by default

login
register
mail settings
Submitter phabricator
Date Jan. 21, 2020, 6:38 p.m.
Message ID <differential-rev-PHID-DREV-fwxp4b2qfjc4nfbgna6s-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44560/
State Superseded
Headers show

Comments

phabricator - Jan. 21, 2020, 6:38 p.m.
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7963

AFFECTED 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

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-devel
phabricator - Feb. 5, 2020, 11:20 p.m.
marmoute added a comment.
marmoute accepted this revision.


  Seem good to go, once the other one in the series are taken.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7963/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7963

To: mharbison72, #hg-reviewers, marmoute
Cc: marmoute, mercurial-devel

Patch

diff --git a/tests/test-lfs-test-server.t b/tests/test-lfs-test-server.t
--- a/tests/test-lfs-test-server.t
+++ b/tests/test-lfs-test-server.t
@@ -40,6 +40,8 @@ 
 #endif
 
   $ cat >> $HGRCPATH <<EOF
+  > [experimental]
+  > lfs.worker-enable = False
   > [extensions]
   > lfs=
   > [lfs]
diff --git a/tests/test-lfs-serve.t b/tests/test-lfs-serve.t
--- a/tests/test-lfs-serve.t
+++ b/tests/test-lfs-serve.t
@@ -65,6 +65,7 @@ 
   > debugprocessors = $TESTTMP/debugprocessors.py
   > [experimental]
   > lfs.disableusercache = True
+  > lfs.worker-enable = False
   > [lfs]
   > threshold=10
   > [web]
diff --git a/tests/test-lfs-serve-access.t b/tests/test-lfs-serve-access.t
--- a/tests/test-lfs-serve-access.t
+++ b/tests/test-lfs-serve-access.t
@@ -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
 
diff --git a/hgext/lfs/__init__.py b/hgext/lfs/__init__.py
--- a/hgext/lfs/__init__.py
+++ b/hgext/lfs/__init__.py
@@ -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(
diff --git a/hgext/lfs/TODO.rst b/hgext/lfs/TODO.rst
--- a/hgext/lfs/TODO.rst
+++ b/hgext/lfs/TODO.rst
@@ -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