Patchwork [3,of,8,"] compression: introduce a `storage.revlog.zlib.level` configuration

login
register
mail settings
Submitter Matt Harbison
Date April 28, 2019, 10:31 p.m.
Message ID <op.z0y96qfn9lwrgf@envy>
Download mbox | patch
Permalink /patch/39891/
State New
Headers show

Comments

Matt Harbison - April 28, 2019, 10:31 p.m.
On Sun, 31 Mar 2019 11:36:19 -0400, Pierre-Yves David  
<pierre-yves.david@ens-lyon.org> wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@octobus.net>
> # Date 1553708127 -3600
> #      Wed Mar 27 18:35:27 2019 +0100
> # Node ID df7c537a8d07d6c1d4e7aa7604af30a57717bcf6
> # Parent  0779dd6ec612bf7dcb5ca4628b42409dad2cde29
> # EXP-Topic zstd-revlog
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r  
> df7c537a8d07
> compression: introduce a `storage.revlog.zlib.level` configuration

Not sure what's going on here, but I noticed the OS X buildbot has a  
problem with test-repo-compengines.t when using --pure. [1]  Windows has a  
different output on this test, which I've bisected back to this commit  
(1fac9b931d46):



[1]  
https://buildbot.mercurial-scm.org/builders/macOS%2010.12%20hg%20tests%20%28stable%29/builds/128/steps/pure/logs/stdio

Patch

--- c:/Users/Matt/hg/tests/test-repo-compengines.t
+++ c:/Users/Matt/hg/tests/test-repo-compengines.t.err
@@ -111,9 +111,10 @@ 
    > done

    $ $RUNTESTDIR/f -s */.hg/store/data/*
-  zlib-level-1/.hg/store/data/a.i: size=4146
-  zlib-level-9/.hg/store/data/a.i: size=4138
-  zlib-level-default/.hg/store/data/a.i: size=4138
+  default/.hg/store/data/foo.i: size=64\r (esc)
+  zlib-level-1/.hg/store/data/a.i: size=4138\r (esc)
+  zlib-level-9/.hg/store/data/a.i: size=4138\r (esc)
+  zlib-level-default/.hg/store/data/a.i: size=4138\r (esc)

  Test error cases

@@ -123,9 +124,6 @@ 
    > revlog.zlib.level=foobar
    > EOF
    $ commitone zlib-level-invalid
-  abort: storage.revlog.zlib.level is not a valid integer ('foobar')
-  abort: storage.revlog.zlib.level is not a valid integer ('foobar')
-  [255]

    $ hg init zlib-level-out-of-range
    $ cat << EOF >> zlib-level-out-of-range/.hg/hgrc
@@ -134,7 +132,4 @@ 
    > EOF

    $ commitone zlib-level-out-of-range
-  abort: invalid value for `storage.revlog.zlib.level` config: 42
-  abort: invalid value for `storage.revlog.zlib.level` config: 42
-  [255]


ERROR: test-repo-compengines.t output changed
!
Failed test-repo-compengines.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: 1576757354


The strange thing is that on both systems, --pure works if coupled with  
--local.  I assume the file size difference is some file not being opened  
in binary mode?

With the latest stable, there's additional output:

--- c:/Users/Matt/hg/tests/test-repo-compengines.t
+++ c:/Users/Matt/hg/tests/test-repo-compengines.t.err
@@ -22,9 +22,6 @@ 
  Unknown compression engine to format.compression aborts

    $ hg --config format.revlog-compression=unknown init unknown
-  abort: compression engine unknown defined by format.revlog-compression  
not available
-  (run "hg debuginstall" to list available compression engines)
-  [255]

  A requirement specifying an unknown compression engine results in bail