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 - `_. - #. Show to-be-applied rules with `hg files -r 'wdir()' 'set:lfs()'` * `debugignore` can show file + line number, so a dedicated command could be 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/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/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-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 < [experimental] + > lfs.worker-enable = False > [extensions] > lfs= > [lfs]