# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1570212353 14400
#      Fri Oct 04 14:05:53 2019 -0400
# Node ID 5809f162c3f8ac6d6905dd88beb5513712a4ca21
# Parent  57a0774b62ff7df27721f640640d0900fe590325
test: update test to match the new sidedata format entry

A new requirement appears, we have to take this in account.

diff --git a/tests/test-find-asv-variants.t b/tests/test-find-asv-variants.t
--- a/tests/test-find-asv-variants.t
+++ b/tests/test-find-asv-variants.t
@@ -49,27 +49,27 @@
   Running debugupgraderepo because of format mismatch:
   	generaldelta: False != True (repo/config)
   building a reference tarball
-  result available at: my-reference-I-d9c2fe76-reference.tar
+  result available at: my-reference-I-e9b617b5-reference.tar
 
   $ make-reference some-dir/my-source-repo my-reference-I p-config.yaml --hgrc no-general-delta-hgrc
   hg cloning repository from: some-dir/my-source-repo
   copying hgrc file from: no-general-delta-hgrc
   building a reference tarball
-  result available at: my-reference-I-2b380e39-reference.tar
+  result available at: my-reference-I-a74614d7-reference.tar
 
   $ ls -1
-  my-reference-I-2b380e39-reference
-  my-reference-I-2b380e39-reference.tar
-  my-reference-I-2b380e39.benchrepo
-  my-reference-I-d9c2fe76-reference
-  my-reference-I-d9c2fe76-reference.tar
-  my-reference-I-d9c2fe76.benchrepo
+  my-reference-I-a74614d7-reference
+  my-reference-I-a74614d7-reference.tar
+  my-reference-I-a74614d7.benchrepo
+  my-reference-I-e9b617b5-reference
+  my-reference-I-e9b617b5-reference.tar
+  my-reference-I-e9b617b5.benchrepo
   no-general-delta-hgrc
   no-sparse-revlog-hgrc
   p-config.yaml
   some-dir
 
-  $ cat my-reference-I-2b380e39.benchrepo
+  $ cat my-reference-I-a74614d7.benchrepo
   partial-sets:
     missing-last-10:
       remove: last(all(), 10)
@@ -83,6 +83,7 @@
       fncache: true
       generaldelta: false
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: false
     hg-version: * (glob)
     id: my-reference-I
@@ -95,8 +96,8 @@
     number-revisions:
       all: 53
       visible: 53
-    repo-hash: 2b380e39
-    repo-prefix: my-reference-I-2b380e39
+    repo-hash: a74614d7
+    repo-prefix: my-reference-I-a74614d7
     source: some-dir/my-source-repo
   roles:
     pull:
@@ -105,7 +106,7 @@
           source: reference
           target: same
 
-  $ cat my-reference-I-d9c2fe76.benchrepo
+  $ cat my-reference-I-e9b617b5.benchrepo
   partial-sets:
     missing-last-10:
       remove: last(all(), 10)
@@ -119,6 +120,7 @@
       fncache: true
       generaldelta: true
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: false
     hg-version: * (glob)
     id: my-reference-I
@@ -131,8 +133,8 @@
     number-revisions:
       all: 53
       visible: 53
-    repo-hash: d9c2fe76
-    repo-prefix: my-reference-I-d9c2fe76
+    repo-hash: e9b617b5
+    repo-prefix: my-reference-I-e9b617b5
     source: some-dir/my-source-repo
   roles:
     pull:
@@ -153,6 +155,7 @@
     [True],
     [False, True],
     [True],
+    [False],
     [False]],
    ['repo',
     'repo-format-compression',
@@ -161,9 +164,10 @@
     'repo-format-fncache',
     'repo-format-generaldelta',
     'repo-format-plain-cl-delta',
+    'repo-format-sidedata',
     'repo-format-sparserevlog'],
-   8,
-   {'my-reference-I-2b380e39': {'partial-sets': {'missing-last-10': {'remove': 'last(all(), 10)'},
+   9,
+   {'my-reference-I-a74614d7': {'partial-sets': {'missing-last-10': {'remove': 'last(all(), 10)'},
                                                  'same': None},
                                 'reference-repo': {'enabled': True,
                                                    'format-info': {'compression': 'zlib',
@@ -172,6 +176,7 @@
                                                                    'fncache': True,
                                                                    'generaldelta': False,
                                                                    'plain-cl-delta': True,
+                                                                   'sidedata': False,
                                                                    'sparserevlog': False},
                                                    'hg-version': '*', (glob)
                                                    'id': 'my-reference-I',
@@ -181,12 +186,12 @@
                                                                            'visible': 1},
                                                    'number-revisions': {'all': 53,
                                                                         'visible': 53},
-                                                   'repo-hash': '2b380e39',
-                                                   'repo-prefix': 'my-reference-I-2b380e39',
+                                                   'repo-hash': 'a74614d7',
+                                                   'repo-prefix': 'my-reference-I-a74614d7',
                                                    'source': 'some-dir/my-source-repo'},
                                 'roles': {'pull': {'noop': {'same': {'source': 'reference',
                                                                      'target': 'same'}}}}},
-    'my-reference-I-d9c2fe76': {'partial-sets': {'missing-last-10': {'remove': 'last(all(), 10)'},
+    'my-reference-I-e9b617b5': {'partial-sets': {'missing-last-10': {'remove': 'last(all(), 10)'},
                                                  'same': None},
                                 'reference-repo': {'enabled': True,
                                                    'format-info': {'compression': 'zlib',
@@ -195,6 +200,7 @@
                                                                    'fncache': True,
                                                                    'generaldelta': True,
                                                                    'plain-cl-delta': True,
+                                                                   'sidedata': False,
                                                                    'sparserevlog': False},
                                                    'hg-version': '*', (glob)
                                                    'id': 'my-reference-I',
@@ -204,15 +210,15 @@
                                                                            'visible': 1},
                                                    'number-revisions': {'all': 53,
                                                                         'visible': 53},
-                                                   'repo-hash': 'd9c2fe76',
-                                                   'repo-prefix': 'my-reference-I-d9c2fe76',
+                                                   'repo-hash': 'e9b617b5',
+                                                   'repo-prefix': 'my-reference-I-e9b617b5',
                                                    'source': 'some-dir/my-source-repo'},
                                 'roles': {'pull': {'noop': {'same': {'source': 'reference',
                                                                      'target': 'same'}}}}}},
-   {('my-reference-I', (('repo-format-compression', 'zlib'), ('repo-format-compression-level', 'default'), ('repo-format-dotencode', True), ('repo-format-fncache', True), ('repo-format-generaldelta', False), ('repo-format-plain-cl-delta', True), ('repo-format-sparserevlog', False))): 'my-reference-I-2b380e39',
-    ('my-reference-I', (('repo-format-compression', 'zlib'), ('repo-format-compression-level', 'default'), ('repo-format-dotencode', True), ('repo-format-fncache', True), ('repo-format-generaldelta', True), ('repo-format-plain-cl-delta', True), ('repo-format-sparserevlog', False))): 'my-reference-I-d9c2fe76'},
+   {('my-reference-I', (('repo-format-compression', 'zlib'), ('repo-format-compression-level', 'default'), ('repo-format-dotencode', True), ('repo-format-fncache', True), ('repo-format-generaldelta', False), ('repo-format-plain-cl-delta', True), ('repo-format-sidedata', False), ('repo-format-sparserevlog', False))): 'my-reference-I-a74614d7',
+    ('my-reference-I', (('repo-format-compression', 'zlib'), ('repo-format-compression-level', 'default'), ('repo-format-dotencode', True), ('repo-format-fncache', True), ('repo-format-generaldelta', True), ('repo-format-plain-cl-delta', True), ('repo-format-sidedata', False), ('repo-format-sparserevlog', False))): 'my-reference-I-e9b617b5'},
    ['missing-last-10', 'same'],
-   {'pull': {'noop': {'same': {'my-reference-I-2b380e39': {'source': 'reference',
+   {'pull': {'noop': {'same': {'my-reference-I-a74614d7': {'source': 'reference',
                                                            'target': 'same'},
-                               'my-reference-I-d9c2fe76': {'source': 'reference',
+                               'my-reference-I-e9b617b5': {'source': 'reference',
                                                            'target': 'same'}}}}})
diff --git a/tests/test-make-all.t b/tests/test-make-all.t
--- a/tests/test-make-all.t
+++ b/tests/test-make-all.t
@@ -43,14 +43,14 @@
   $ make-all 4.7 some-dir/my-source-repo testrepo p-config.yaml
   hg cloning repository from: some-dir/my-source-repo
   building a reference tarball
-  result available at: testrepo-355c4044-reference.tar
-  Cloning testrepo (testrepo-355c4044-reference stripped of last(all(), 10)) into ./testrepo-355c4044-partial-missing-last-10 (for exchange benchmarks)
-  Cloning testrepo (testrepo-355c4044-reference stripped of None) into ./testrepo-355c4044-partial-same (for exchange benchmarks)
+  result available at: testrepo-70587f0e-reference.tar
+  Cloning testrepo (testrepo-70587f0e-reference stripped of last(all(), 10)) into ./testrepo-70587f0e-partial-missing-last-10 (for exchange benchmarks)
+  Cloning testrepo (testrepo-70587f0e-reference stripped of None) into ./testrepo-70587f0e-partial-same (for exchange benchmarks)
 
   $ ls -1 *.tar
-  testrepo-355c4044-partial-missing-last-10.tar
-  testrepo-355c4044-partial-same.tar
-  testrepo-355c4044-reference.tar
+  testrepo-70587f0e-partial-missing-last-10.tar
+  testrepo-70587f0e-partial-same.tar
+  testrepo-70587f0e-reference.tar
   $ tar -axf testrepo-reference.tar testrepo.benchrepo -O
   tar: testrepo-reference.tar: Cannot open: No such file or directory
   tar: Error is not recoverable: exiting now
diff --git a/tests/test-make-partials.t b/tests/test-make-partials.t
--- a/tests/test-make-partials.t
+++ b/tests/test-make-partials.t
@@ -46,11 +46,11 @@
   $ make-reference ../some-dir/source_A repo4test_A ../p-config.yaml
   hg cloning repository from: ../some-dir/source_A
   building a reference tarball
-  result available at: repo4test_A-17702431-reference.tar
+  result available at: repo4test_A-d876cf13-reference.tar
   $ make-reference ../some-dir/source_B repo4test_B ../p-config2.yaml
   hg cloning repository from: ../some-dir/source_B
   building a reference tarball
-  result available at: repo4test_B-67049247-reference.tar
+  result available at: repo4test_B-f8dfa2ee-reference.tar
   $ cd ..
 
 Unbundle local reference
@@ -71,13 +71,13 @@
   $ cd partials-one
 
   $ make-partial-repos ../local-references/repo4test_A-*.benchrepo
-  Cloning repo4test_A (../local-references/repo4test_A-17702431-reference stripped of last(all(), 10)) into ./repo4test_A-17702431-partial-missing-last-10 (for exchange benchmarks)
-  Cloning repo4test_A (../local-references/repo4test_A-17702431-reference stripped of None) into ./repo4test_A-17702431-partial-same (for exchange benchmarks)
+  Cloning repo4test_A (../local-references/repo4test_A-d876cf13-reference stripped of last(all(), 10)) into ./repo4test_A-d876cf13-partial-missing-last-10 (for exchange benchmarks)
+  Cloning repo4test_A (../local-references/repo4test_A-d876cf13-reference stripped of None) into ./repo4test_A-d876cf13-partial-same (for exchange benchmarks)
   $ ls -1
-  repo4test_A-17702431-partial-missing-last-10
-  repo4test_A-17702431-partial-missing-last-10.tar
-  repo4test_A-17702431-partial-same
-  repo4test_A-17702431-partial-same.tar
+  repo4test_A-d876cf13-partial-missing-last-10
+  repo4test_A-d876cf13-partial-missing-last-10.tar
+  repo4test_A-d876cf13-partial-same
+  repo4test_A-d876cf13-partial-same.tar
   $ hg -R ../local-references/repo4test_A-*-reference tip -T '{rev}:{node}\n'
   52:99cae3713489c109d3f91f755bd6d6ea0363d0d5
   $ hg -R repo4test_A-*-partial-missing-last-10 tip -T '{rev}:{node}\n'
@@ -100,61 +100,61 @@
   $ cd partials-multiple
 
   $ make-partial-repos ../local-references/*.benchrepo
-  Cloning repo4test_A (../local-references/repo4test_A-17702431-reference stripped of last(all(), 10)) into ./repo4test_A-17702431-partial-missing-last-10 (for exchange benchmarks)
-  Cloning repo4test_A (../local-references/repo4test_A-17702431-reference stripped of None) into ./repo4test_A-17702431-partial-same (for exchange benchmarks)
-  Cloning repo4test_B (../local-references/repo4test_B-67049247-reference stripped of last(all(), 10)) into ./repo4test_B-67049247-partial-missing-last-10 (for exchange benchmarks)
-  Cloning repo4test_B (../local-references/repo4test_B-67049247-reference stripped of last(all(), 100)) into ./repo4test_B-67049247-partial-missing-last-100 (for exchange benchmarks)
-  Cloning repo4test_B (../local-references/repo4test_B-67049247-reference stripped of None) into ./repo4test_B-67049247-partial-same (for exchange benchmarks)
+  Cloning repo4test_A (../local-references/repo4test_A-d876cf13-reference stripped of last(all(), 10)) into ./repo4test_A-d876cf13-partial-missing-last-10 (for exchange benchmarks)
+  Cloning repo4test_A (../local-references/repo4test_A-d876cf13-reference stripped of None) into ./repo4test_A-d876cf13-partial-same (for exchange benchmarks)
+  Cloning repo4test_B (../local-references/repo4test_B-f8dfa2ee-reference stripped of last(all(), 10)) into ./repo4test_B-f8dfa2ee-partial-missing-last-10 (for exchange benchmarks)
+  Cloning repo4test_B (../local-references/repo4test_B-f8dfa2ee-reference stripped of last(all(), 100)) into ./repo4test_B-f8dfa2ee-partial-missing-last-100 (for exchange benchmarks)
+  Cloning repo4test_B (../local-references/repo4test_B-f8dfa2ee-reference stripped of None) into ./repo4test_B-f8dfa2ee-partial-same (for exchange benchmarks)
   $ ls -1
-  repo4test_A-17702431-partial-missing-last-10
-  repo4test_A-17702431-partial-missing-last-10.tar
-  repo4test_A-17702431-partial-same
-  repo4test_A-17702431-partial-same.tar
-  repo4test_B-67049247-partial-missing-last-10
-  repo4test_B-67049247-partial-missing-last-10.tar
-  repo4test_B-67049247-partial-missing-last-100
-  repo4test_B-67049247-partial-missing-last-100.tar
-  repo4test_B-67049247-partial-same
-  repo4test_B-67049247-partial-same.tar
+  repo4test_A-d876cf13-partial-missing-last-10
+  repo4test_A-d876cf13-partial-missing-last-10.tar
+  repo4test_A-d876cf13-partial-same
+  repo4test_A-d876cf13-partial-same.tar
+  repo4test_B-f8dfa2ee-partial-missing-last-10
+  repo4test_B-f8dfa2ee-partial-missing-last-10.tar
+  repo4test_B-f8dfa2ee-partial-missing-last-100
+  repo4test_B-f8dfa2ee-partial-missing-last-100.tar
+  repo4test_B-f8dfa2ee-partial-same
+  repo4test_B-f8dfa2ee-partial-same.tar
 
   $ tar tf repo4test_B-*-partial-same.tar | sort
-  ./repo4test_B-67049247-partial-same/
-  ./repo4test_B-67049247-partial-same/.hg/
-  ./repo4test_B-67049247-partial-same/.hg/00changelog.i
-  ./repo4test_B-67049247-partial-same/.hg/ASV_EXPECTED_TIP_REV_HASH
-  ./repo4test_B-67049247-partial-same/.hg/cache/
-  ./repo4test_B-67049247-partial-same/.hg/cache/branch2-base
-  ./repo4test_B-67049247-partial-same/.hg/cache/branch2-immutable
-  ./repo4test_B-67049247-partial-same/.hg/cache/branch2-served
-  ./repo4test_B-67049247-partial-same/.hg/cache/branch2-served.hidden
-  ./repo4test_B-67049247-partial-same/.hg/cache/branch2-visible
-  ./repo4test_B-67049247-partial-same/.hg/cache/branch2-visible-hidden
-  ./repo4test_B-67049247-partial-same/.hg/cache/hgtagsfnodes1
-  ./repo4test_B-67049247-partial-same/.hg/cache/rbc-names-v1
-  ./repo4test_B-67049247-partial-same/.hg/cache/rbc-revs-v1
-  ./repo4test_B-67049247-partial-same/.hg/cache/tags2
-  ./repo4test_B-67049247-partial-same/.hg/cache/tags2-served
-  ./repo4test_B-67049247-partial-same/.hg/hgrc
-  ./repo4test_B-67049247-partial-same/.hg/requires
-  ./repo4test_B-67049247-partial-same/.hg/store/
-  ./repo4test_B-67049247-partial-same/.hg/store/00changelog.i
-  ./repo4test_B-67049247-partial-same/.hg/store/00manifest.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf0.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf1.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf10.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf11.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf2.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf3.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf4.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf5.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf6.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf7.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf8.i
-  ./repo4test_B-67049247-partial-same/.hg/store/data/nf9.i
-  ./repo4test_B-67049247-partial-same/.hg/store/fncache
-  ./repo4test_B-67049247-partial-same/.hg/wcache/
-  ./repo4test_B-67049247-partial-same/.hg/wcache/manifestfulltextcache
+  ./repo4test_B-f8dfa2ee-partial-same/
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/00changelog.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/ASV_EXPECTED_TIP_REV_HASH
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/branch2-base
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/branch2-immutable
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/branch2-served
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/branch2-served.hidden
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/branch2-visible
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/branch2-visible-hidden
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/hgtagsfnodes1
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/rbc-names-v1
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/rbc-revs-v1
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/tags2
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/cache/tags2-served
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/hgrc
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/requires
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/00changelog.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/00manifest.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf0.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf1.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf10.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf11.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf2.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf3.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf4.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf5.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf6.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf7.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf8.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/data/nf9.i
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/store/fncache
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/wcache/
+  ./repo4test_B-f8dfa2ee-partial-same/.hg/wcache/manifestfulltextcache
   $ tar -axf repo4test_B-*-partial-same.tar ./repo4test_B-*-partial-same/.hg/ASV_EXPECTED_TIP_REV_HASH -O
   11 c0808a653b4884c4dcda90aa39bf6dca45972de3 (no-eol)
   $ tar -axf repo4test_B-*-partial-same.tar ./repo4test_B-*-partial-same/.hg/hgrc -O
@@ -197,16 +197,16 @@
     enabled: false
   $ make-partial-repos ../local-references/*.benchrepo
   skipping disabled reference repository: repo4test_A
-  Cloning repo4test_B (../local-references/repo4test_B-67049247-reference stripped of last(all(), 10)) into ./repo4test_B-67049247-partial-missing-last-10 (for exchange benchmarks)
-  Cloning repo4test_B (../local-references/repo4test_B-67049247-reference stripped of last(all(), 100)) into ./repo4test_B-67049247-partial-missing-last-100 (for exchange benchmarks)
-  Cloning repo4test_B (../local-references/repo4test_B-67049247-reference stripped of None) into ./repo4test_B-67049247-partial-same (for exchange benchmarks)
+  Cloning repo4test_B (../local-references/repo4test_B-f8dfa2ee-reference stripped of last(all(), 10)) into ./repo4test_B-f8dfa2ee-partial-missing-last-10 (for exchange benchmarks)
+  Cloning repo4test_B (../local-references/repo4test_B-f8dfa2ee-reference stripped of last(all(), 100)) into ./repo4test_B-f8dfa2ee-partial-missing-last-100 (for exchange benchmarks)
+  Cloning repo4test_B (../local-references/repo4test_B-f8dfa2ee-reference stripped of None) into ./repo4test_B-f8dfa2ee-partial-same (for exchange benchmarks)
   $ ls -1
-  repo4test_B-67049247-partial-missing-last-10
-  repo4test_B-67049247-partial-missing-last-10.tar
-  repo4test_B-67049247-partial-missing-last-100
-  repo4test_B-67049247-partial-missing-last-100.tar
-  repo4test_B-67049247-partial-same
-  repo4test_B-67049247-partial-same.tar
+  repo4test_B-f8dfa2ee-partial-missing-last-10
+  repo4test_B-f8dfa2ee-partial-missing-last-10.tar
+  repo4test_B-f8dfa2ee-partial-missing-last-100
+  repo4test_B-f8dfa2ee-partial-missing-last-100.tar
+  repo4test_B-f8dfa2ee-partial-same
+  repo4test_B-f8dfa2ee-partial-same.tar
   $ sed -i 's/enabled: No/enabled: Yes/' ../local-references/repo4test_A-*.benchrepo
   $ grep enabled ../local-references/repo4test_A-*.benchrepo
     enabled: false
@@ -227,7 +227,7 @@
   using 'repo4test_C-existing-reference' as source instead of cloning
   (make sure this was cloned with the right version)
   building a reference tarball
-  result available at: repo4test_C-fbc7bb74-reference.tar
+  result available at: repo4test_C-84b1c829-reference.tar
   $ cd ../local-references
   $ tar xf ../repo-references/repo4test_C-*-reference.tar --warning=no-timestamp
   $ cat repo4test_C-*-reference/.hg/hgrc
@@ -252,120 +252,120 @@
 
   $ make-partial-repos ../local-references/repo4test_C-*.benchrepo
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  Cloning repo4test_C (../local-references/repo4test_C-fbc7bb74-reference stripped of last(all(), 10)) into ./repo4test_C-fbc7bb74-partial-missing-last-10 (for exchange benchmarks)
-  Cloning repo4test_C (../local-references/repo4test_C-fbc7bb74-reference stripped of None) into ./repo4test_C-fbc7bb74-partial-same (for exchange benchmarks)
+  Cloning repo4test_C (../local-references/repo4test_C-84b1c829-reference stripped of last(all(), 10)) into ./repo4test_C-84b1c829-partial-missing-last-10 (for exchange benchmarks)
+  Cloning repo4test_C (../local-references/repo4test_C-84b1c829-reference stripped of None) into ./repo4test_C-84b1c829-partial-same (for exchange benchmarks)
   $ ls -1
-  repo4test_C-fbc7bb74-partial-missing-last-10
-  repo4test_C-fbc7bb74-partial-missing-last-10.tar
-  repo4test_C-fbc7bb74-partial-same
-  repo4test_C-fbc7bb74-partial-same.tar
+  repo4test_C-84b1c829-partial-missing-last-10
+  repo4test_C-84b1c829-partial-missing-last-10.tar
+  repo4test_C-84b1c829-partial-same
+  repo4test_C-84b1c829-partial-same.tar
 
   $ tar tf repo4test_C-*-partial-same.tar | sort
-  ./repo4test_C-fbc7bb74-partial-same/
-  ./repo4test_C-fbc7bb74-partial-same/.hg/
-  ./repo4test_C-fbc7bb74-partial-same/.hg/00changelog.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/ASV_EXPECTED_TIP_REV_HASH
-  ./repo4test_C-fbc7bb74-partial-same/.hg/branch
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/branch2-base
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/branch2-immutable
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/branch2-served
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/branch2-served.hidden
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/branch2-visible
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/branch2-visible-hidden
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/hgtagsfnodes1
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/rbc-names-v1
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/rbc-revs-v1
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/tags2
-  ./repo4test_C-fbc7bb74-partial-same/.hg/cache/tags2-served
-  ./repo4test_C-fbc7bb74-partial-same/.hg/dirstate
-  ./repo4test_C-fbc7bb74-partial-same/.hg/hgrc
-  ./repo4test_C-fbc7bb74-partial-same/.hg/requires
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/00changelog.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/00manifest.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf0.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf1.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf10.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf11.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf12.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf13.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf14.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf15.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf16.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf17.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf18.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf19.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf2.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf20.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf21.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf22.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf23.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf24.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf25.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf26.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf27.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf28.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf29.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf3.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf30.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf31.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf32.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf33.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf34.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf35.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf36.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf37.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf38.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf39.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf4.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf40.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf41.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf42.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf43.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf44.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf45.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf46.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf47.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf48.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf49.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf5.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf50.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf51.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf52.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf6.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf7.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf8.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/data/nf9.i
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/fncache
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/phaseroots
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/undo
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/undo.backupfiles
-  ./repo4test_C-fbc7bb74-partial-same/.hg/store/undo.phaseroots
-  ./repo4test_C-fbc7bb74-partial-same/.hg/undo.bookmarks
-  ./repo4test_C-fbc7bb74-partial-same/.hg/undo.branch
-  ./repo4test_C-fbc7bb74-partial-same/.hg/undo.desc
-  ./repo4test_C-fbc7bb74-partial-same/.hg/undo.dirstate
-  ./repo4test_C-fbc7bb74-partial-same/.hg/wcache/
-  ./repo4test_C-fbc7bb74-partial-same/.hg/wcache/checkisexec
-  ./repo4test_C-fbc7bb74-partial-same/.hg/wcache/checklink
-  ./repo4test_C-fbc7bb74-partial-same/.hg/wcache/checklink-target
-  ./repo4test_C-fbc7bb74-partial-same/.hg/wcache/manifestfulltextcache
-  ./repo4test_C-fbc7bb74-partial-same/nf10
-  ./repo4test_C-fbc7bb74-partial-same/nf11
-  ./repo4test_C-fbc7bb74-partial-same/nf12
-  ./repo4test_C-fbc7bb74-partial-same/nf13
-  ./repo4test_C-fbc7bb74-partial-same/nf14
-  ./repo4test_C-fbc7bb74-partial-same/nf15
-  ./repo4test_C-fbc7bb74-partial-same/nf16
-  ./repo4test_C-fbc7bb74-partial-same/nf17
-  ./repo4test_C-fbc7bb74-partial-same/nf51
-  ./repo4test_C-fbc7bb74-partial-same/nf52
-  ./repo4test_C-fbc7bb74-partial-same/nf6
-  ./repo4test_C-fbc7bb74-partial-same/nf7
-  ./repo4test_C-fbc7bb74-partial-same/nf8
-  ./repo4test_C-fbc7bb74-partial-same/nf9
+  ./repo4test_C-84b1c829-partial-same/
+  ./repo4test_C-84b1c829-partial-same/.hg/
+  ./repo4test_C-84b1c829-partial-same/.hg/00changelog.i
+  ./repo4test_C-84b1c829-partial-same/.hg/ASV_EXPECTED_TIP_REV_HASH
+  ./repo4test_C-84b1c829-partial-same/.hg/branch
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/branch2-base
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/branch2-immutable
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/branch2-served
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/branch2-served.hidden
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/branch2-visible
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/branch2-visible-hidden
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/hgtagsfnodes1
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/rbc-names-v1
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/rbc-revs-v1
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/tags2
+  ./repo4test_C-84b1c829-partial-same/.hg/cache/tags2-served
+  ./repo4test_C-84b1c829-partial-same/.hg/dirstate
+  ./repo4test_C-84b1c829-partial-same/.hg/hgrc
+  ./repo4test_C-84b1c829-partial-same/.hg/requires
+  ./repo4test_C-84b1c829-partial-same/.hg/store/
+  ./repo4test_C-84b1c829-partial-same/.hg/store/00changelog.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/00manifest.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf0.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf1.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf10.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf11.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf12.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf13.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf14.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf15.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf16.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf17.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf18.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf19.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf2.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf20.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf21.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf22.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf23.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf24.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf25.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf26.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf27.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf28.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf29.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf3.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf30.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf31.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf32.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf33.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf34.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf35.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf36.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf37.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf38.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf39.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf4.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf40.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf41.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf42.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf43.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf44.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf45.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf46.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf47.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf48.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf49.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf5.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf50.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf51.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf52.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf6.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf7.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf8.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/data/nf9.i
+  ./repo4test_C-84b1c829-partial-same/.hg/store/fncache
+  ./repo4test_C-84b1c829-partial-same/.hg/store/phaseroots
+  ./repo4test_C-84b1c829-partial-same/.hg/store/undo
+  ./repo4test_C-84b1c829-partial-same/.hg/store/undo.backupfiles
+  ./repo4test_C-84b1c829-partial-same/.hg/store/undo.phaseroots
+  ./repo4test_C-84b1c829-partial-same/.hg/undo.bookmarks
+  ./repo4test_C-84b1c829-partial-same/.hg/undo.branch
+  ./repo4test_C-84b1c829-partial-same/.hg/undo.desc
+  ./repo4test_C-84b1c829-partial-same/.hg/undo.dirstate
+  ./repo4test_C-84b1c829-partial-same/.hg/wcache/
+  ./repo4test_C-84b1c829-partial-same/.hg/wcache/checkisexec
+  ./repo4test_C-84b1c829-partial-same/.hg/wcache/checklink
+  ./repo4test_C-84b1c829-partial-same/.hg/wcache/checklink-target
+  ./repo4test_C-84b1c829-partial-same/.hg/wcache/manifestfulltextcache
+  ./repo4test_C-84b1c829-partial-same/nf10
+  ./repo4test_C-84b1c829-partial-same/nf11
+  ./repo4test_C-84b1c829-partial-same/nf12
+  ./repo4test_C-84b1c829-partial-same/nf13
+  ./repo4test_C-84b1c829-partial-same/nf14
+  ./repo4test_C-84b1c829-partial-same/nf15
+  ./repo4test_C-84b1c829-partial-same/nf16
+  ./repo4test_C-84b1c829-partial-same/nf17
+  ./repo4test_C-84b1c829-partial-same/nf51
+  ./repo4test_C-84b1c829-partial-same/nf52
+  ./repo4test_C-84b1c829-partial-same/nf6
+  ./repo4test_C-84b1c829-partial-same/nf7
+  ./repo4test_C-84b1c829-partial-same/nf8
+  ./repo4test_C-84b1c829-partial-same/nf9
   $ tar -axf repo4test_C-*-partial-same.tar ./repo4test_C-*-partial-same/.hg/ASV_EXPECTED_TIP_REV_HASH -O
   52 99cae3713489c109d3f91f755bd6d6ea0363d0d5 (no-eol)
   $ tar -axf repo4test_C-*-partial-same.tar ./repo4test_C-*-partial-same/.hg/hgrc -O
diff --git a/tests/test-make-reference.t b/tests/test-make-reference.t
--- a/tests/test-make-reference.t
+++ b/tests/test-make-reference.t
@@ -58,11 +58,11 @@
   	generaldelta: False != True (repo/config)
   	sparserevlog: False != True (repo/config)
   building a reference tarball
-  result available at: my-reference-0c229866-reference.tar
+  result available at: my-reference-b4ea682b-reference.tar
   $ ls -1
-  my-reference-0c229866-reference
-  my-reference-0c229866-reference.tar
-  my-reference-0c229866.benchrepo
+  my-reference-b4ea682b-reference
+  my-reference-b4ea682b-reference.tar
+  my-reference-b4ea682b.benchrepo
   p-config.yaml
   some-dir
   $ cat my-reference-*.benchrepo
@@ -79,6 +79,7 @@
       fncache: true
       generaldelta: true
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: true
     hg-version: * (glob)
     id: my-reference
@@ -91,8 +92,8 @@
     number-revisions:
       all: 53
       visible: 53
-    repo-hash: 0c229866
-    repo-prefix: my-reference-0c229866
+    repo-hash: b4ea682b
+    repo-prefix: my-reference-b4ea682b
     source: some-dir/my-source-repo
   roles:
     pull:
@@ -117,11 +118,11 @@
   	generaldelta: False != True (repo/config)
   	sparserevlog: False != True (repo/config)
   building a reference tarball
-  result available at: my-reference-0c229866-reference.tar
+  result available at: my-reference-b4ea682b-reference.tar
   $ ls -1
-  my-reference-0c229866-reference
-  my-reference-0c229866-reference.tar
-  my-reference-0c229866.benchrepo
+  my-reference-b4ea682b-reference
+  my-reference-b4ea682b-reference.tar
+  my-reference-b4ea682b.benchrepo
   p-config.yaml
   some-dir
   $ cat my-reference-*.benchrepo
@@ -138,6 +139,7 @@
       fncache: true
       generaldelta: true
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: true
     hg-version: * (glob)
     id: my-reference
@@ -150,8 +152,8 @@
     number-revisions:
       all: 53
       visible: 53
-    repo-hash: 0c229866
-    repo-prefix: my-reference-0c229866
+    repo-hash: b4ea682b
+    repo-prefix: my-reference-b4ea682b
     source: some-dir/my-source-repo
   roles:
     pull:
@@ -160,93 +162,93 @@
           source: reference
           target: same
   $ tar tf my-reference-*-reference.tar | sort
-  my-reference-0c229866-reference/
-  my-reference-0c229866-reference/.hg/
-  my-reference-0c229866-reference/.hg/00changelog.i
-  my-reference-0c229866-reference/.hg/cache/
-  my-reference-0c229866-reference/.hg/cache/branch2-base
-  my-reference-0c229866-reference/.hg/cache/branch2-immutable
-  my-reference-0c229866-reference/.hg/cache/branch2-served
-  my-reference-0c229866-reference/.hg/cache/branch2-served.hidden
-  my-reference-0c229866-reference/.hg/cache/branch2-visible
-  my-reference-0c229866-reference/.hg/cache/branch2-visible-hidden
-  my-reference-0c229866-reference/.hg/cache/hgtagsfnodes1
-  my-reference-0c229866-reference/.hg/cache/rbc-names-v1
-  my-reference-0c229866-reference/.hg/cache/rbc-revs-v1
-  my-reference-0c229866-reference/.hg/cache/tags2
-  my-reference-0c229866-reference/.hg/cache/tags2-served
-  my-reference-0c229866-reference/.hg/dirstate
-  my-reference-0c229866-reference/.hg/localtags
-  my-reference-0c229866-reference/.hg/requires
-  my-reference-0c229866-reference/.hg/store/
-  my-reference-0c229866-reference/.hg/store/00changelog.i
-  my-reference-0c229866-reference/.hg/store/00manifest.i
-  my-reference-0c229866-reference/.hg/store/data/
-  my-reference-0c229866-reference/.hg/store/data/nf0.i
-  my-reference-0c229866-reference/.hg/store/data/nf1.i
-  my-reference-0c229866-reference/.hg/store/data/nf10.i
-  my-reference-0c229866-reference/.hg/store/data/nf11.i
-  my-reference-0c229866-reference/.hg/store/data/nf12.i
-  my-reference-0c229866-reference/.hg/store/data/nf13.i
-  my-reference-0c229866-reference/.hg/store/data/nf14.i
-  my-reference-0c229866-reference/.hg/store/data/nf15.i
-  my-reference-0c229866-reference/.hg/store/data/nf16.i
-  my-reference-0c229866-reference/.hg/store/data/nf17.i
-  my-reference-0c229866-reference/.hg/store/data/nf18.i
-  my-reference-0c229866-reference/.hg/store/data/nf19.i
-  my-reference-0c229866-reference/.hg/store/data/nf2.i
-  my-reference-0c229866-reference/.hg/store/data/nf20.i
-  my-reference-0c229866-reference/.hg/store/data/nf21.i
-  my-reference-0c229866-reference/.hg/store/data/nf22.i
-  my-reference-0c229866-reference/.hg/store/data/nf23.i
-  my-reference-0c229866-reference/.hg/store/data/nf24.i
-  my-reference-0c229866-reference/.hg/store/data/nf25.i
-  my-reference-0c229866-reference/.hg/store/data/nf26.i
-  my-reference-0c229866-reference/.hg/store/data/nf27.i
-  my-reference-0c229866-reference/.hg/store/data/nf28.i
-  my-reference-0c229866-reference/.hg/store/data/nf29.i
-  my-reference-0c229866-reference/.hg/store/data/nf3.i
-  my-reference-0c229866-reference/.hg/store/data/nf30.i
-  my-reference-0c229866-reference/.hg/store/data/nf31.i
-  my-reference-0c229866-reference/.hg/store/data/nf32.i
-  my-reference-0c229866-reference/.hg/store/data/nf33.i
-  my-reference-0c229866-reference/.hg/store/data/nf34.i
-  my-reference-0c229866-reference/.hg/store/data/nf35.i
-  my-reference-0c229866-reference/.hg/store/data/nf36.i
-  my-reference-0c229866-reference/.hg/store/data/nf37.i
-  my-reference-0c229866-reference/.hg/store/data/nf38.i
-  my-reference-0c229866-reference/.hg/store/data/nf39.i
-  my-reference-0c229866-reference/.hg/store/data/nf4.i
-  my-reference-0c229866-reference/.hg/store/data/nf40.i
-  my-reference-0c229866-reference/.hg/store/data/nf41.i
-  my-reference-0c229866-reference/.hg/store/data/nf42.i
-  my-reference-0c229866-reference/.hg/store/data/nf43.i
-  my-reference-0c229866-reference/.hg/store/data/nf44.i
-  my-reference-0c229866-reference/.hg/store/data/nf45.i
-  my-reference-0c229866-reference/.hg/store/data/nf46.i
-  my-reference-0c229866-reference/.hg/store/data/nf47.i
-  my-reference-0c229866-reference/.hg/store/data/nf48.i
-  my-reference-0c229866-reference/.hg/store/data/nf49.i
-  my-reference-0c229866-reference/.hg/store/data/nf5.i
-  my-reference-0c229866-reference/.hg/store/data/nf50.i
-  my-reference-0c229866-reference/.hg/store/data/nf51.i
-  my-reference-0c229866-reference/.hg/store/data/nf52.i
-  my-reference-0c229866-reference/.hg/store/data/nf6.i
-  my-reference-0c229866-reference/.hg/store/data/nf7.i
-  my-reference-0c229866-reference/.hg/store/data/nf8.i
-  my-reference-0c229866-reference/.hg/store/data/nf9.i
-  my-reference-0c229866-reference/.hg/store/fncache
-  my-reference-0c229866-reference/.hg/store/phaseroots
-  my-reference-0c229866-reference/.hg/store/undo
-  my-reference-0c229866-reference/.hg/store/undo.backupfiles
-  my-reference-0c229866-reference/.hg/store/undo.phaseroots
-  my-reference-0c229866-reference/.hg/undo.bookmarks
-  my-reference-0c229866-reference/.hg/undo.branch
-  my-reference-0c229866-reference/.hg/undo.desc
-  my-reference-0c229866-reference/.hg/undo.dirstate
-  my-reference-0c229866-reference/.hg/wcache/
-  my-reference-0c229866-reference/.hg/wcache/manifestfulltextcache
-  my-reference-0c229866.benchrepo
+  my-reference-b4ea682b-reference/
+  my-reference-b4ea682b-reference/.hg/
+  my-reference-b4ea682b-reference/.hg/00changelog.i
+  my-reference-b4ea682b-reference/.hg/cache/
+  my-reference-b4ea682b-reference/.hg/cache/branch2-base
+  my-reference-b4ea682b-reference/.hg/cache/branch2-immutable
+  my-reference-b4ea682b-reference/.hg/cache/branch2-served
+  my-reference-b4ea682b-reference/.hg/cache/branch2-served.hidden
+  my-reference-b4ea682b-reference/.hg/cache/branch2-visible
+  my-reference-b4ea682b-reference/.hg/cache/branch2-visible-hidden
+  my-reference-b4ea682b-reference/.hg/cache/hgtagsfnodes1
+  my-reference-b4ea682b-reference/.hg/cache/rbc-names-v1
+  my-reference-b4ea682b-reference/.hg/cache/rbc-revs-v1
+  my-reference-b4ea682b-reference/.hg/cache/tags2
+  my-reference-b4ea682b-reference/.hg/cache/tags2-served
+  my-reference-b4ea682b-reference/.hg/dirstate
+  my-reference-b4ea682b-reference/.hg/localtags
+  my-reference-b4ea682b-reference/.hg/requires
+  my-reference-b4ea682b-reference/.hg/store/
+  my-reference-b4ea682b-reference/.hg/store/00changelog.i
+  my-reference-b4ea682b-reference/.hg/store/00manifest.i
+  my-reference-b4ea682b-reference/.hg/store/data/
+  my-reference-b4ea682b-reference/.hg/store/data/nf0.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf1.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf10.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf11.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf12.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf13.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf14.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf15.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf16.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf17.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf18.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf19.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf2.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf20.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf21.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf22.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf23.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf24.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf25.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf26.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf27.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf28.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf29.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf3.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf30.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf31.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf32.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf33.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf34.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf35.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf36.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf37.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf38.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf39.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf4.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf40.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf41.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf42.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf43.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf44.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf45.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf46.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf47.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf48.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf49.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf5.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf50.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf51.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf52.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf6.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf7.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf8.i
+  my-reference-b4ea682b-reference/.hg/store/data/nf9.i
+  my-reference-b4ea682b-reference/.hg/store/fncache
+  my-reference-b4ea682b-reference/.hg/store/phaseroots
+  my-reference-b4ea682b-reference/.hg/store/undo
+  my-reference-b4ea682b-reference/.hg/store/undo.backupfiles
+  my-reference-b4ea682b-reference/.hg/store/undo.phaseroots
+  my-reference-b4ea682b-reference/.hg/undo.bookmarks
+  my-reference-b4ea682b-reference/.hg/undo.branch
+  my-reference-b4ea682b-reference/.hg/undo.desc
+  my-reference-b4ea682b-reference/.hg/undo.dirstate
+  my-reference-b4ea682b-reference/.hg/wcache/
+  my-reference-b4ea682b-reference/.hg/wcache/manifestfulltextcache
+  my-reference-b4ea682b.benchrepo
 
 update the reference
 --------------------
@@ -265,6 +267,7 @@
       fncache: true
       generaldelta: true
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: true
     hg-version: * (glob)
     id: my-reference
@@ -277,8 +280,8 @@
     number-revisions:
       all: 53
       visible: 53
-    repo-hash: 0c229866
-    repo-prefix: my-reference-0c229866
+    repo-hash: b4ea682b
+    repo-prefix: my-reference-b4ea682b
     source: some-dir/my-source-repo
   roles:
     pull:
@@ -311,6 +314,7 @@
       fncache: true
       generaldelta: true
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: true
     hg-version: * (glob)
     id: my-reference
@@ -323,8 +327,8 @@
     number-revisions:
       all: 53
       visible: 53
-    repo-hash: 0c229866
-    repo-prefix: my-reference-0c229866
+    repo-hash: b4ea682b
+    repo-prefix: my-reference-b4ea682b
     source: some-dir/my-other-source-repo
   roles:
     pull:
@@ -341,7 +345,7 @@
   $ ls -1
   dst
   editor.sh
-  my-reference-0c229866-reference.tar
+  my-reference-b4ea682b-reference.tar
   p-config.yaml
   some-dir
   $ make-reference some-dir/my-source-repo my-reference p-config.yaml --optimize re-delta-parent re-delta-multibase
@@ -351,13 +355,13 @@
   Running `debugupgraderepo` with requested optimizations:
   	re-delta-parent, re-delta-multibase
   building a reference tarball
-  result available at: my-reference-0c229866-reference.tar
+  result available at: my-reference-b4ea682b-reference.tar
   $ ls -1
   dst
   editor.sh
-  my-reference-0c229866-reference
-  my-reference-0c229866-reference.tar
-  my-reference-0c229866.benchrepo
+  my-reference-b4ea682b-reference
+  my-reference-b4ea682b-reference.tar
+  my-reference-b4ea682b.benchrepo
   p-config.yaml
   some-dir
   $ cat my-reference-*.benchrepo
@@ -374,6 +378,7 @@
       fncache: true
       generaldelta: true
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: true
     hg-version: * (glob)
     id: my-reference
@@ -386,8 +391,8 @@
     number-revisions:
       all: 53
       visible: 53
-    repo-hash: 0c229866
-    repo-prefix: my-reference-0c229866
+    repo-hash: b4ea682b
+    repo-prefix: my-reference-b4ea682b
     source: some-dir/my-source-repo
   roles:
     pull:
@@ -403,7 +408,7 @@
   $ ls -1
   dst
   editor.sh
-  my-reference-0c229866-reference
+  my-reference-b4ea682b-reference
   p-config.yaml
   some-dir
 
@@ -424,14 +429,14 @@
   Running debugupgraderepo because of format mismatch:
   	generaldelta: False != True (repo/config)
   building a reference tarball
-  result available at: my-reference-8e2c7069-reference.tar
+  result available at: my-reference-2665f76c-reference.tar
   $ ls -1
   dst
   editor.sh
-  my-reference-0c229866-reference
-  my-reference-8e2c7069-reference
-  my-reference-8e2c7069-reference.tar
-  my-reference-8e2c7069.benchrepo
+  my-reference-2665f76c-reference
+  my-reference-2665f76c-reference.tar
+  my-reference-2665f76c.benchrepo
+  my-reference-b4ea682b-reference
   p-config.yaml
   some-dir
   sparse-revlog-hgrc
@@ -450,6 +455,7 @@
       fncache: true
       generaldelta: true
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: false
     hg-version: * (glob)
     id: my-reference
@@ -462,8 +468,8 @@
     number-revisions:
       all: 53
       visible: 53
-    repo-hash: 8e2c7069
-    repo-prefix: my-reference-8e2c7069
+    repo-hash: 2665f76c
+    repo-prefix: my-reference-2665f76c
     source: some-dir/my-source-repo
   roles:
     pull:
diff --git a/tests/test-setup-repos.t b/tests/test-setup-repos.t
--- a/tests/test-setup-repos.t
+++ b/tests/test-setup-repos.t
@@ -43,15 +43,15 @@
   $ make-all 5.0 ../some-dir/test1 test1repo ../p-config.yaml
   hg cloning repository from: ../some-dir/test1
   building a reference tarball
-  result available at: test1repo-4ac61281-reference.tar
-  Cloning test1repo (test1repo-4ac61281-reference stripped of last(all(), 10)) into ./test1repo-4ac61281-partial-missing-last-10 (for exchange benchmarks)
-  Cloning test1repo (test1repo-4ac61281-reference stripped of None) into ./test1repo-4ac61281-partial-same (for exchange benchmarks)
+  result available at: test1repo-6a11000b-reference.tar
+  Cloning test1repo (test1repo-6a11000b-reference stripped of last(all(), 10)) into ./test1repo-6a11000b-partial-missing-last-10 (for exchange benchmarks)
+  Cloning test1repo (test1repo-6a11000b-reference stripped of None) into ./test1repo-6a11000b-partial-same (for exchange benchmarks)
   $ make-all 5.0 ../some-dir/test2 test2repo ../p-config.yaml
   hg cloning repository from: ../some-dir/test2
   building a reference tarball
-  result available at: test2repo-b7c3972a-reference.tar
-  Cloning test2repo (test2repo-b7c3972a-reference stripped of last(all(), 10)) into ./test2repo-b7c3972a-partial-missing-last-10 (for exchange benchmarks)
-  Cloning test2repo (test2repo-b7c3972a-reference stripped of None) into ./test2repo-b7c3972a-partial-same (for exchange benchmarks)
+  result available at: test2repo-1787ae4f-reference.tar
+  Cloning test2repo (test2repo-1787ae4f-reference stripped of last(all(), 10)) into ./test2repo-1787ae4f-partial-missing-last-10 (for exchange benchmarks)
+  Cloning test2repo (test2repo-1787ae4f-reference stripped of None) into ./test2repo-1787ae4f-partial-same (for exchange benchmarks)
   $ cd ..
   $ mkdir reference-tar
   $ mv reference-tmp/*.tar reference-tar
@@ -61,11 +61,11 @@
 
   $ cat << EOF >> test.repos
   > # first repo
-  > test1repo-4ac61281
+  > test1repo-6a11000b
   > 
   > # second repo
   > # with longer comment
-  > test2repo-b7c3972a
+  > test2repo-1787ae4f
   > EOF
 
 Test the setup-script
@@ -78,7 +78,7 @@
   14 files updated, 0 files merged, 0 files removed, 0 files unresolved
   23 files updated, 0 files merged, 0 files removed, 0 files unresolved
   2 repositories to setup in $TESTTMP/repos
-  Setting up reference repository: test1repo-4ac61281
+  Setting up reference repository: test1repo-6a11000b
     main reference
       downloading repo
       updating repo
@@ -86,7 +86,7 @@
       downloading repo
     partial reference:  same
       downloading repo
-  Setting up reference repository: test2repo-b7c3972a
+  Setting up reference repository: test2repo-1787ae4f
     main reference
       downloading repo
       updating repo
@@ -96,34 +96,34 @@
       downloading repo
   $ ls -d1 $TESTTMP/repos/* $TESTTMP/repos/*/.hg/scm-perf-repo-digest $TESTTMP/repos/partial-references/*  $TESTTMP/repos/partial-references/*/.hg/scm-perf-repo-digest
   $TESTTMP/repos/partial-references
-  $TESTTMP/repos/partial-references/test1repo-4ac61281-partial-missing-last-10
-  $TESTTMP/repos/partial-references/test1repo-4ac61281-partial-missing-last-10/.hg/scm-perf-repo-digest
-  $TESTTMP/repos/partial-references/test1repo-4ac61281-partial-same
-  $TESTTMP/repos/partial-references/test1repo-4ac61281-partial-same/.hg/scm-perf-repo-digest
-  $TESTTMP/repos/partial-references/test2repo-b7c3972a-partial-missing-last-10
-  $TESTTMP/repos/partial-references/test2repo-b7c3972a-partial-missing-last-10/.hg/scm-perf-repo-digest
-  $TESTTMP/repos/partial-references/test2repo-b7c3972a-partial-same
-  $TESTTMP/repos/partial-references/test2repo-b7c3972a-partial-same/.hg/scm-perf-repo-digest
-  $TESTTMP/repos/test1repo-4ac61281-reference
-  $TESTTMP/repos/test1repo-4ac61281-reference/.hg/scm-perf-repo-digest
-  $TESTTMP/repos/test1repo-4ac61281.benchrepo
-  $TESTTMP/repos/test2repo-b7c3972a-reference
-  $TESTTMP/repos/test2repo-b7c3972a-reference/.hg/scm-perf-repo-digest
-  $TESTTMP/repos/test2repo-b7c3972a.benchrepo
+  $TESTTMP/repos/partial-references/test1repo-6a11000b-partial-missing-last-10
+  $TESTTMP/repos/partial-references/test1repo-6a11000b-partial-missing-last-10/.hg/scm-perf-repo-digest
+  $TESTTMP/repos/partial-references/test1repo-6a11000b-partial-same
+  $TESTTMP/repos/partial-references/test1repo-6a11000b-partial-same/.hg/scm-perf-repo-digest
+  $TESTTMP/repos/partial-references/test2repo-1787ae4f-partial-missing-last-10
+  $TESTTMP/repos/partial-references/test2repo-1787ae4f-partial-missing-last-10/.hg/scm-perf-repo-digest
+  $TESTTMP/repos/partial-references/test2repo-1787ae4f-partial-same
+  $TESTTMP/repos/partial-references/test2repo-1787ae4f-partial-same/.hg/scm-perf-repo-digest
+  $TESTTMP/repos/test1repo-6a11000b-reference
+  $TESTTMP/repos/test1repo-6a11000b-reference/.hg/scm-perf-repo-digest
+  $TESTTMP/repos/test1repo-6a11000b.benchrepo
+  $TESTTMP/repos/test2repo-1787ae4f-reference
+  $TESTTMP/repos/test2repo-1787ae4f-reference/.hg/scm-perf-repo-digest
+  $TESTTMP/repos/test2repo-1787ae4f.benchrepo
 
 Check the reference repository are updated
 
   $ ls -1 $TESTTMP/repos/*
-  $TESTTMP/repos/test1repo-4ac61281.benchrepo
-  $TESTTMP/repos/test2repo-b7c3972a.benchrepo
+  $TESTTMP/repos/test1repo-6a11000b.benchrepo
+  $TESTTMP/repos/test2repo-1787ae4f.benchrepo
   
   $TESTTMP/repos/partial-references:
-  test1repo-4ac61281-partial-missing-last-10
-  test1repo-4ac61281-partial-same
-  test2repo-b7c3972a-partial-missing-last-10
-  test2repo-b7c3972a-partial-same
+  test1repo-6a11000b-partial-missing-last-10
+  test1repo-6a11000b-partial-same
+  test2repo-1787ae4f-partial-missing-last-10
+  test2repo-1787ae4f-partial-same
   
-  $TESTTMP/repos/test1repo-4ac61281-reference:
+  $TESTTMP/repos/test1repo-6a11000b-reference:
   nf10
   nf11
   nf12
@@ -139,7 +139,7 @@
   nf8
   nf9
   
-  $TESTTMP/repos/test2repo-b7c3972a-reference:
+  $TESTTMP/repos/test2repo-1787ae4f-reference:
   nf10
   nf11
   nf12
@@ -167,27 +167,27 @@
 Check the partial variant has not been updated
 
   $ ls -1 $TESTTMP/repos/partial-references/*
-  $TESTTMP/repos/partial-references/test1repo-4ac61281-partial-missing-last-10:
+  $TESTTMP/repos/partial-references/test1repo-6a11000b-partial-missing-last-10:
   
-  $TESTTMP/repos/partial-references/test1repo-4ac61281-partial-same:
+  $TESTTMP/repos/partial-references/test1repo-6a11000b-partial-same:
   
-  $TESTTMP/repos/partial-references/test2repo-b7c3972a-partial-missing-last-10:
+  $TESTTMP/repos/partial-references/test2repo-1787ae4f-partial-missing-last-10:
   
-  $TESTTMP/repos/partial-references/test2repo-b7c3972a-partial-same:
+  $TESTTMP/repos/partial-references/test2repo-1787ae4f-partial-same:
 
 Does not do any work if all is already there
 --------------------------------------------
 
   $ setup-repos test.repos repos "file://$TESTTMP/reference-tar/"
   2 repositories to setup in $TESTTMP/repos
-  Setting up reference repository: test1repo-4ac61281
+  Setting up reference repository: test1repo-6a11000b
     main reference
       already up to date
     partial reference:  missing-last-10
       already up to date
     partial reference:  same
       already up to date
-  Setting up reference repository: test2repo-b7c3972a
+  Setting up reference repository: test2repo-1787ae4f
     main reference
       already up to date
     partial reference:  missing-last-10
@@ -201,14 +201,14 @@
   $ rm -rf $TESTTMP/repos/partial-references/test2*same
   $ setup-repos test.repos repos "file://$TESTTMP/reference-tar/"
   2 repositories to setup in $TESTTMP/repos
-  Setting up reference repository: test1repo-4ac61281
+  Setting up reference repository: test1repo-6a11000b
     main reference
       already up to date
     partial reference:  missing-last-10
       already up to date
     partial reference:  same
       already up to date
-  Setting up reference repository: test2repo-b7c3972a
+  Setting up reference repository: test2repo-1787ae4f
     main reference
       already up to date
     partial reference:  missing-last-10
@@ -223,7 +223,7 @@
   $ setup-repos test.repos repos "file://$TESTTMP/reference-tar/"
   14 files updated, 0 files merged, 0 files removed, 0 files unresolved
   2 repositories to setup in $TESTTMP/repos
-  Setting up reference repository: test1repo-4ac61281
+  Setting up reference repository: test1repo-6a11000b
     main reference
       downloading repo
       updating repo
@@ -231,7 +231,7 @@
       downloading repo
     partial reference:  same
       downloading repo
-  Setting up reference repository: test2repo-b7c3972a
+  Setting up reference repository: test2repo-1787ae4f
     main reference
       already up to date
     partial reference:  missing-last-10
@@ -251,14 +251,14 @@
   [1]
   $ setup-repos test.repos repos "file://$TESTTMP/reference-tar/"
   2 repositories to setup in $TESTTMP/repos
-  Setting up reference repository: test1repo-4ac61281
+  Setting up reference repository: test1repo-6a11000b
     main reference
       already up to date
     partial reference:  missing-last-10
       already up to date
     partial reference:  same
       already up to date
-  Setting up reference repository: test2repo-b7c3972a
+  Setting up reference repository: test2repo-1787ae4f
     main reference
       already up to date
     partial reference:  missing-last-10
@@ -266,7 +266,7 @@
     partial reference:  same
       downloading repo
   $ ls $TESTTMP/repos/partial-references/test2*same/.hg/scm-perf-repo-digest
-  $TESTTMP/repos/partial-references/test2repo-b7c3972a-partial-same/.hg/scm-perf-repo-digest
+  $TESTTMP/repos/partial-references/test2repo-1787ae4f-partial-same/.hg/scm-perf-repo-digest
   $ ls $TESSTTMP/repos/partial-references/test2*same/.hg/foo
   ls: cannot access '/repos/partial-references/test2*same/.hg/foo': No such file or directory
   [2]
@@ -281,7 +281,7 @@
   $ setup-repos test.repos repos "file://$TESTTMP/reference-tar/"
   14 files updated, 0 files merged, 0 files removed, 0 files unresolved
   2 repositories to setup in $TESTTMP/repos
-  Setting up reference repository: test1repo-4ac61281
+  Setting up reference repository: test1repo-6a11000b
     main reference
       already up to date
     missing data file
@@ -291,7 +291,7 @@
       already up to date
     partial reference:  same
       already up to date
-  Setting up reference repository: test2repo-b7c3972a
+  Setting up reference repository: test2repo-1787ae4f
     main reference
       already up to date
     partial reference:  missing-last-10
diff --git a/tests/test-smoke-test.t b/tests/test-smoke-test.t
--- a/tests/test-smoke-test.t
+++ b/tests/test-smoke-test.t
@@ -35,22 +35,22 @@
   $ make-reference ../test-repo smoke-test-A p-config.yaml
   hg cloning repository from: ../test-repo
   building a reference tarball
-  result available at: smoke-test-A-11eb1fef-reference.tar
+  result available at: smoke-test-A-1a246934-reference.tar
 
   $ make-reference ../test-repo smoke-test-B p-config.yaml
   hg cloning repository from: ../test-repo
   building a reference tarball
-  result available at: smoke-test-B-4324509a-reference.tar
+  result available at: smoke-test-B-744eedfb-reference.tar
 
   $ make-partial-repos *.benchrepo
-  Cloning smoke-test-A (smoke-test-A-11eb1fef-reference stripped of last(all(), 100)) into ./smoke-test-A-11eb1fef-partial-last-hundred (for exchange benchmarks)
-  Cloning smoke-test-A (smoke-test-A-11eb1fef-reference stripped of last(all(), 10)) into ./smoke-test-A-11eb1fef-partial-last-ten (for exchange benchmarks)
-  Cloning smoke-test-A (smoke-test-A-11eb1fef-reference stripped of last(all(), 1000)) into ./smoke-test-A-11eb1fef-partial-last-thousand (for exchange benchmarks)
-  Cloning smoke-test-A (smoke-test-A-11eb1fef-reference stripped of None) into ./smoke-test-A-11eb1fef-partial-same (for exchange benchmarks)
-  Cloning smoke-test-B (smoke-test-B-4324509a-reference stripped of last(all(), 100)) into ./smoke-test-B-4324509a-partial-last-hundred (for exchange benchmarks)
-  Cloning smoke-test-B (smoke-test-B-4324509a-reference stripped of last(all(), 10)) into ./smoke-test-B-4324509a-partial-last-ten (for exchange benchmarks)
-  Cloning smoke-test-B (smoke-test-B-4324509a-reference stripped of last(all(), 1000)) into ./smoke-test-B-4324509a-partial-last-thousand (for exchange benchmarks)
-  Cloning smoke-test-B (smoke-test-B-4324509a-reference stripped of None) into ./smoke-test-B-4324509a-partial-same (for exchange benchmarks)
+  Cloning smoke-test-A (smoke-test-A-1a246934-reference stripped of last(all(), 100)) into ./smoke-test-A-1a246934-partial-last-hundred (for exchange benchmarks)
+  Cloning smoke-test-A (smoke-test-A-1a246934-reference stripped of last(all(), 10)) into ./smoke-test-A-1a246934-partial-last-ten (for exchange benchmarks)
+  Cloning smoke-test-A (smoke-test-A-1a246934-reference stripped of last(all(), 1000)) into ./smoke-test-A-1a246934-partial-last-thousand (for exchange benchmarks)
+  Cloning smoke-test-A (smoke-test-A-1a246934-reference stripped of None) into ./smoke-test-A-1a246934-partial-same (for exchange benchmarks)
+  Cloning smoke-test-B (smoke-test-B-744eedfb-reference stripped of last(all(), 100)) into ./smoke-test-B-744eedfb-partial-last-hundred (for exchange benchmarks)
+  Cloning smoke-test-B (smoke-test-B-744eedfb-reference stripped of last(all(), 10)) into ./smoke-test-B-744eedfb-partial-last-ten (for exchange benchmarks)
+  Cloning smoke-test-B (smoke-test-B-744eedfb-reference stripped of last(all(), 1000)) into ./smoke-test-B-744eedfb-partial-last-thousand (for exchange benchmarks)
+  Cloning smoke-test-B (smoke-test-B-744eedfb-reference stripped of None) into ./smoke-test-B-744eedfb-partial-same (for exchange benchmarks)
   $ cd ..
 
 setup a copy of the asv repo
@@ -58,9 +58,9 @@
   $ rsync --exclude 'repos' --exclude 'mercurial' --exclude 'results' -ra $TESTDIR/.. test-asv
   $ cd test-asv
   $ cat << EOF > local.repos
-  > smoke-test-A-11eb1fef
+  > smoke-test-A-1a246934
   > # (second copy of the same repo, for testing)
-  > smoke-test-B-4324509a
+  > smoke-test-B-744eedfb
   > EOF
 
 setup appropriate virtual env
@@ -91,7 +91,7 @@
   $ export HGRCPATH="${TESTTMP}"/test-asv/test.hgrc
   $ $PYTHON ./script/setup-repos $TESTTMP/test-asv/local.repos repos "file://$TESTTMP/references/"
   2 repositories to setup in $TESTTMP/test-asv/repos
-  Setting up reference repository: smoke-test-A-11eb1fef
+  Setting up reference repository: smoke-test-A-1a246934
     main reference
       downloading repo
       updating repo
@@ -103,7 +103,7 @@
       downloading repo
     partial reference:  same
       downloading repo
-  Setting up reference repository: smoke-test-B-4324509a
+  Setting up reference repository: smoke-test-B-744eedfb
     main reference
       downloading repo
       updating repo
@@ -164,7 +164,7 @@
   + repofiles=./local.repos
   + ./script/setup-repos ./local.repos ./repos
   2 repositories to setup in $TESTTMP/test-asv/repos
-  Setting up reference repository: smoke-test-A-11eb1fef
+  Setting up reference repository: smoke-test-A-1a246934
     main reference
       already up to date
     partial reference:  last-hundred
@@ -175,7 +175,7 @@
       already up to date
     partial reference:  same
       already up to date
-  Setting up reference repository: smoke-test-B-4324509a
+  Setting up reference repository: smoke-test-B-744eedfb
     main reference
       already up to date
     partial reference:  last-hundred
@@ -191,75 +191,75 @@
   ++ date +%s
   + starttime=* (glob)
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/smoke-test-A-11eb1fef-reference/.hg
-  + r=repos/smoke-test-A-11eb1fef-reference
-  + echo checking caches for: repos/smoke-test-A-11eb1fef-reference
-  checking caches for: repos/smoke-test-A-11eb1fef-reference
+  ++ dirname repos/smoke-test-A-1a246934-reference/.hg
+  + r=repos/smoke-test-A-1a246934-reference
+  + echo checking caches for: repos/smoke-test-A-1a246934-reference
+  checking caches for: repos/smoke-test-A-1a246934-reference
   + HGRCPATH=
-  + mercurial/hg -R repos/smoke-test-A-11eb1fef-reference debugupdatecache
+  + mercurial/hg -R repos/smoke-test-A-1a246934-reference debugupdatecache
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/smoke-test-B-4324509a-reference/.hg
-  + r=repos/smoke-test-B-4324509a-reference
-  + echo checking caches for: repos/smoke-test-B-4324509a-reference
-  checking caches for: repos/smoke-test-B-4324509a-reference
+  ++ dirname repos/smoke-test-B-744eedfb-reference/.hg
+  + r=repos/smoke-test-B-744eedfb-reference
+  + echo checking caches for: repos/smoke-test-B-744eedfb-reference
+  checking caches for: repos/smoke-test-B-744eedfb-reference
   + HGRCPATH=
-  + mercurial/hg -R repos/smoke-test-B-4324509a-reference debugupdatecache
+  + mercurial/hg -R repos/smoke-test-B-744eedfb-reference debugupdatecache
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/partial-references/smoke-test-A-11eb1fef-partial-last-hundred/.hg
-  + r=repos/partial-references/smoke-test-A-11eb1fef-partial-last-hundred
-  + echo checking caches for: repos/partial-references/smoke-test-A-11eb1fef-partial-last-hundred
-  checking caches for: repos/partial-references/smoke-test-A-11eb1fef-partial-last-hundred
+  ++ dirname repos/partial-references/smoke-test-A-1a246934-partial-last-hundred/.hg
+  + r=repos/partial-references/smoke-test-A-1a246934-partial-last-hundred
+  + echo checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-hundred
+  checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-hundred
   + HGRCPATH=
-  + mercurial/hg -R repos/partial-references/smoke-test-A-11eb1fef-partial-last-hundred debugupdatecache
+  + mercurial/hg -R repos/partial-references/smoke-test-A-1a246934-partial-last-hundred debugupdatecache
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/partial-references/smoke-test-A-11eb1fef-partial-last-ten/.hg
-  + r=repos/partial-references/smoke-test-A-11eb1fef-partial-last-ten
-  + echo checking caches for: repos/partial-references/smoke-test-A-11eb1fef-partial-last-ten
-  checking caches for: repos/partial-references/smoke-test-A-11eb1fef-partial-last-ten
+  ++ dirname repos/partial-references/smoke-test-A-1a246934-partial-last-ten/.hg
+  + r=repos/partial-references/smoke-test-A-1a246934-partial-last-ten
+  + echo checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-ten
+  checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-ten
   + HGRCPATH=
-  + mercurial/hg -R repos/partial-references/smoke-test-A-11eb1fef-partial-last-ten debugupdatecache
+  + mercurial/hg -R repos/partial-references/smoke-test-A-1a246934-partial-last-ten debugupdatecache
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/partial-references/smoke-test-A-11eb1fef-partial-last-thousand/.hg
-  + r=repos/partial-references/smoke-test-A-11eb1fef-partial-last-thousand
-  + echo checking caches for: repos/partial-references/smoke-test-A-11eb1fef-partial-last-thousand
-  checking caches for: repos/partial-references/smoke-test-A-11eb1fef-partial-last-thousand
+  ++ dirname repos/partial-references/smoke-test-A-1a246934-partial-last-thousand/.hg
+  + r=repos/partial-references/smoke-test-A-1a246934-partial-last-thousand
+  + echo checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-thousand
+  checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-last-thousand
   + HGRCPATH=
-  + mercurial/hg -R repos/partial-references/smoke-test-A-11eb1fef-partial-last-thousand debugupdatecache
+  + mercurial/hg -R repos/partial-references/smoke-test-A-1a246934-partial-last-thousand debugupdatecache
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/partial-references/smoke-test-A-11eb1fef-partial-same/.hg
-  + r=repos/partial-references/smoke-test-A-11eb1fef-partial-same
-  + echo checking caches for: repos/partial-references/smoke-test-A-11eb1fef-partial-same
-  checking caches for: repos/partial-references/smoke-test-A-11eb1fef-partial-same
+  ++ dirname repos/partial-references/smoke-test-A-1a246934-partial-same/.hg
+  + r=repos/partial-references/smoke-test-A-1a246934-partial-same
+  + echo checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-same
+  checking caches for: repos/partial-references/smoke-test-A-1a246934-partial-same
   + HGRCPATH=
-  + mercurial/hg -R repos/partial-references/smoke-test-A-11eb1fef-partial-same debugupdatecache
+  + mercurial/hg -R repos/partial-references/smoke-test-A-1a246934-partial-same debugupdatecache
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/partial-references/smoke-test-B-4324509a-partial-last-hundred/.hg
-  + r=repos/partial-references/smoke-test-B-4324509a-partial-last-hundred
-  + echo checking caches for: repos/partial-references/smoke-test-B-4324509a-partial-last-hundred
-  checking caches for: repos/partial-references/smoke-test-B-4324509a-partial-last-hundred
+  ++ dirname repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred/.hg
+  + r=repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred
+  + echo checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred
+  checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred
   + HGRCPATH=
-  + mercurial/hg -R repos/partial-references/smoke-test-B-4324509a-partial-last-hundred debugupdatecache
+  + mercurial/hg -R repos/partial-references/smoke-test-B-744eedfb-partial-last-hundred debugupdatecache
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/partial-references/smoke-test-B-4324509a-partial-last-ten/.hg
-  + r=repos/partial-references/smoke-test-B-4324509a-partial-last-ten
-  + echo checking caches for: repos/partial-references/smoke-test-B-4324509a-partial-last-ten
-  checking caches for: repos/partial-references/smoke-test-B-4324509a-partial-last-ten
+  ++ dirname repos/partial-references/smoke-test-B-744eedfb-partial-last-ten/.hg
+  + r=repos/partial-references/smoke-test-B-744eedfb-partial-last-ten
+  + echo checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-ten
+  checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-ten
   + HGRCPATH=
-  + mercurial/hg -R repos/partial-references/smoke-test-B-4324509a-partial-last-ten debugupdatecache
+  + mercurial/hg -R repos/partial-references/smoke-test-B-744eedfb-partial-last-ten debugupdatecache
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/partial-references/smoke-test-B-4324509a-partial-last-thousand/.hg
-  + r=repos/partial-references/smoke-test-B-4324509a-partial-last-thousand
-  + echo checking caches for: repos/partial-references/smoke-test-B-4324509a-partial-last-thousand
-  checking caches for: repos/partial-references/smoke-test-B-4324509a-partial-last-thousand
+  ++ dirname repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand/.hg
+  + r=repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand
+  + echo checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand
+  checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand
   + HGRCPATH=
-  + mercurial/hg -R repos/partial-references/smoke-test-B-4324509a-partial-last-thousand debugupdatecache
+  + mercurial/hg -R repos/partial-references/smoke-test-B-744eedfb-partial-last-thousand debugupdatecache
   + for r in repos/*/.hg repos/partial-references/*/.hg
-  ++ dirname repos/partial-references/smoke-test-B-4324509a-partial-same/.hg
-  + r=repos/partial-references/smoke-test-B-4324509a-partial-same
-  + echo checking caches for: repos/partial-references/smoke-test-B-4324509a-partial-same
-  checking caches for: repos/partial-references/smoke-test-B-4324509a-partial-same
+  ++ dirname repos/partial-references/smoke-test-B-744eedfb-partial-same/.hg
+  + r=repos/partial-references/smoke-test-B-744eedfb-partial-same
+  + echo checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-same
+  checking caches for: repos/partial-references/smoke-test-B-744eedfb-partial-same
   + HGRCPATH=
-  + mercurial/hg -R repos/partial-references/smoke-test-B-4324509a-partial-same debugupdatecache
+  + mercurial/hg -R repos/partial-references/smoke-test-B-744eedfb-partial-same debugupdatecache
   ++ date +%s
   + endtime=* (glob)
   ++ expr * - * (glob)
@@ -276,26 +276,26 @@
   [  0.00%] -- Benchmarking virtualenv-py2.7-pyyaml-HGMODULEPOLICYrust+c
   [ 50.00%] --- Setting up utils:*                                            ok (glob)
   [ 50.00%] --- simple_command.write.track_commit                               ok
-  [ 50.00%] --- ============== ========================= =============================== ======================= ===================== ========================== ============================ ========================== ======== =====
-                     repo       repo-format-compression   repo-format-compression-level   repo-format-dotencode   repo-format-fncache   repo-format-generaldelta   repo-format-plain-cl-delta   repo-format-sparserevlog    mode        
-                -------------- ------------------------- ------------------------------- ----------------------- --------------------- -------------------------- ---------------------------- -------------------------- -------- -----
-                 smoke-test-A             zlib                       default                       True                   True                    True                        True                        True             create   * (glob)
-                 smoke-test-A             zlib                       default                       True                   True                    True                        True                        True             update   * (glob)
-                 smoke-test-B             zlib                       default                       True                   True                    True                        True                        True             create   * (glob)
-                 smoke-test-B             zlib                       default                       True                   True                    True                        True                        True             update   * (glob)
-                ============== ========================= =============================== ======================= ===================== ========================== ============================ ========================== ======== =====
+  [ 50.00%] --- ============== ========================= =============================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =====
+                     repo       repo-format-compression   repo-format-compression-level   repo-format-dotencode   repo-format-fncache   repo-format-generaldelta   repo-format-plain-cl-delta   repo-format-sidedata   repo-format-sparserevlog    mode        
+                -------------- ------------------------- ------------------------------- ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- -----
+                 smoke-test-A             zlib                       default                       True                   True                    True                        True                     False                     True             create   n/a 
+                 smoke-test-A             zlib                       default                       True                   True                    True                        True                     False                     True             update   n/a 
+                 smoke-test-B             zlib                       default                       True                   True                    True                        True                     False                     True             create   n/a 
+                 smoke-test-B             zlib                       default                       True                   True                    True                        True                     False                     True             update   n/a 
+                ============== ========================= =============================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =====
   
   [ 50.00%] -- Benchmarking virtualenv-py2.7-pyyaml-HGMODULEPOLICYc-HGWITHRUSTEXTcpython
   [100.00%] --- Setting up utils:*                                         ok (glob)
   [100.00%] --- simple_command.write.track_commit                               ok
-  [100.00%] --- ============== ========================= =============================== ======================= ===================== ========================== ============================ ========================== ======== =====================
-                     repo       repo-format-compression   repo-format-compression-level   repo-format-dotencode   repo-format-fncache   repo-format-generaldelta   repo-format-plain-cl-delta   repo-format-sparserevlog    mode                        
-                -------------- ------------------------- ------------------------------- ----------------------- --------------------- -------------------------- ---------------------------- -------------------------- -------- ---------------------
-                 smoke-test-A             zlib                       default                       True                   True                    True                        True                        True             create   * (glob)
-                 smoke-test-A             zlib                       default                       True                   True                    True                        True                        True             update   * (glob)
-                 smoke-test-B             zlib                       default                       True                   True                    True                        True                        True             create   * (glob)
-                 smoke-test-B             zlib                       default                       True                   True                    True                        True                        True             update   * (glob)
-                ============== ========================= =============================== ======================= ===================== ========================== ============================ ========================== ======== =====================
+  [100.00%] --- ============== ========================= =============================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =====================
+                     repo       repo-format-compression   repo-format-compression-level   repo-format-dotencode   repo-format-fncache   repo-format-generaldelta   repo-format-plain-cl-delta   repo-format-sidedata   repo-format-sparserevlog    mode                        
+                -------------- ------------------------- ------------------------------- ----------------------- --------------------- -------------------------- ---------------------------- ---------------------- -------------------------- -------- ---------------------
+                 smoke-test-A             zlib                       default                       True                   True                    True                        True                     False                     True             create   * (glob)
+                 smoke-test-A             zlib                       default                       True                   True                    True                        True                     False                     True             update   * (glob)
+                 smoke-test-B             zlib                       default                       True                   True                    True                        True                     False                     True             create   * (glob)
+                 smoke-test-B             zlib                       default                       True                   True                    True                        True                     False                     True             update   * (glob)
+                ============== ========================= =============================== ======================= ===================== ========================== ============================ ====================== ========================== ======== =====================
   
   + ['./lib/before-check.sh']
   + ['asv', 'run', '--launch-method', 'spawn', '--skip-existing-successful', 'fe3ca1e6', '-b', 'track_commit']
@@ -306,17 +306,17 @@
   $ ls repos/
   partial-references
   skip.json
-  smoke-test-A-11eb1fef-reference
-  smoke-test-A-11eb1fef.benchrepo
-  smoke-test-B-4324509a-reference
-  smoke-test-B-4324509a.benchrepo
+  smoke-test-A-1a246934-reference
+  smoke-test-A-1a246934.benchrepo
+  smoke-test-B-744eedfb-reference
+  smoke-test-B-744eedfb.benchrepo
 
   $ ls repos/partial-references/
-  smoke-test-A-11eb1fef-partial-last-hundred
-  smoke-test-A-11eb1fef-partial-last-ten
-  smoke-test-A-11eb1fef-partial-last-thousand
-  smoke-test-A-11eb1fef-partial-same
-  smoke-test-B-4324509a-partial-last-hundred
-  smoke-test-B-4324509a-partial-last-ten
-  smoke-test-B-4324509a-partial-last-thousand
-  smoke-test-B-4324509a-partial-same
+  smoke-test-A-1a246934-partial-last-hundred
+  smoke-test-A-1a246934-partial-last-ten
+  smoke-test-A-1a246934-partial-last-thousand
+  smoke-test-A-1a246934-partial-same
+  smoke-test-B-744eedfb-partial-last-hundred
+  smoke-test-B-744eedfb-partial-last-ten
+  smoke-test-B-744eedfb-partial-last-thousand
+  smoke-test-B-744eedfb-partial-same
diff --git a/tests/test-upgrade-reference.t b/tests/test-upgrade-reference.t
--- a/tests/test-upgrade-reference.t
+++ b/tests/test-upgrade-reference.t
@@ -75,16 +75,16 @@
   Archiving the new benchrepo file.
   Writing the new reference tar as my-source-repo-*-reference.tar (glob)
   Skipping copy of my-source-repo-partial-missing-last-10.tar, not present in reference archive directory
-  Copying my-source-repo-partial-same.tar into my-source-repo-39241d24-partial-same.tar
-  Fixing directory name inside my-source-repo-39241d24-partial-same.tar
+  Copying my-source-repo-partial-same.tar into my-source-repo-1fcb2e1c-partial-same.tar
+  Fixing directory name inside my-source-repo-1fcb2e1c-partial-same.tar
   Removing the temporary directory.
 
   $ cd ..
 
   $ ls some-dir/
   my-source-repo
-  my-source-repo-39241d24-partial-same.tar
-  my-source-repo-39241d24-reference.tar
+  my-source-repo-1fcb2e1c-partial-same.tar
+  my-source-repo-1fcb2e1c-reference.tar
   my-source-repo-partial-same-copy.tar
   my-source-repo-partial-same.tar
   my-source-repo.benchrepo
@@ -93,13 +93,13 @@
 Check repository name in the '-same' variante
 
   $ tar tf some-dir/my-source-repo-*-partial-same.tar --wildcards '*/.hg/requires'
-  my-source-repo-39241d24-partial-same/.hg/requires
+  my-source-repo-1fcb2e1c-partial-same/.hg/requires
 
 Check the directory and benchrepo is renamed
 
   $ tar tf some-dir/my-source-repo-*-reference.tar --wildcards '*/.hg/requires' '*.benchrepo' | sort
-  my-source-repo-39241d24-reference/.hg/requires
-  my-source-repo-39241d24.benchrepo
+  my-source-repo-1fcb2e1c-reference/.hg/requires
+  my-source-repo-1fcb2e1c.benchrepo
 
   $ tar -xf some-dir/my-source-repo-*-reference.tar --wildcards "my-source-repo-*.benchrepo"
 
@@ -116,9 +116,10 @@
       fncache: true
       generaldelta: true
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: true
     id: my-source-repo
-    repo-prefix: my-source-repo-39241d24
+    repo-prefix: my-source-repo-1fcb2e1c
     source: some-dir/my-source-repo
   roles:
     pull:
@@ -139,10 +140,10 @@
   Reading the original benchrepo file.
   Gathering the new benchrepo data.
   Archiving the new benchrepo file.
-  Writing the new reference tar as my-source-repo-39241d24-reference.tar
-  Skipping copy of my-source-repo-39241d24-partial-missing-last-10.tar, not present in reference archive directory
-  Skipping copy of my-source-repo-39241d24-partial-same.tar, it already has the right file name
-  Directory name inside my-source-repo-39241d24-partial-same.tar is correct
+  Writing the new reference tar as my-source-repo-1fcb2e1c-reference.tar
+  Skipping copy of my-source-repo-1fcb2e1c-partial-missing-last-10.tar, not present in reference archive directory
+  Skipping copy of my-source-repo-1fcb2e1c-partial-same.tar, it already has the right file name
+  Directory name inside my-source-repo-1fcb2e1c-partial-same.tar is correct
   Removing the temporary directory.
 
   $ ls . > ../second-run
@@ -152,7 +153,7 @@
 Test with an archive correctly named but with the wrong directory name
 ----------------------------------------------------------------------
 
-  $ cp my-source-repo-partial-same-copy.tar my-source-repo-39241d24-partial-same.tar
+  $ cp my-source-repo-partial-same-copy.tar my-source-repo-1fcb2e1c-partial-same.tar
 
   $ tar tf my-source-repo-*-partial-same.tar  --wildcards '*/.hg/requires'
   my-source-repo/.hg/requires
@@ -162,14 +163,14 @@
   Reading the original benchrepo file.
   Gathering the new benchrepo data.
   Archiving the new benchrepo file.
-  Writing the new reference tar as my-source-repo-39241d24-reference.tar
-  Skipping copy of my-source-repo-39241d24-partial-missing-last-10.tar, not present in reference archive directory
-  Skipping copy of my-source-repo-39241d24-partial-same.tar, it already has the right file name
-  Fixing directory name inside my-source-repo-39241d24-partial-same.tar
+  Writing the new reference tar as my-source-repo-1fcb2e1c-reference.tar
+  Skipping copy of my-source-repo-1fcb2e1c-partial-missing-last-10.tar, not present in reference archive directory
+  Skipping copy of my-source-repo-1fcb2e1c-partial-same.tar, it already has the right file name
+  Fixing directory name inside my-source-repo-1fcb2e1c-partial-same.tar
   Removing the temporary directory.
 
   $ tar tf my-source-repo-*-partial-same.tar  --wildcards '*/.hg/requires'
-  my-source-repo-39241d24-partial-same/.hg/requires
+  my-source-repo-1fcb2e1c-partial-same/.hg/requires
 
 Check that repo-prefix is preserved
 -----------------------------------
@@ -180,7 +181,7 @@
   $ tar xf my-source-repo-*-reference.tar --touch
   $ old_prefix=`grep repo-prefix $benchrepofile | grep -oE '[^ ]+$'`
   $ echo $old_prefix
-  my-source-repo-39241d24
+  my-source-repo-1fcb2e1c
   $ sed "s/repo-prefix: .*/repo-prefix: my-source-repo-1a2b3c4d/" $benchrepofile > my-source-repo-1a2b3c4d.benchrepo
   $ mv my-source-repo-*-reference my-source-repo-1a2b3c4d-reference
   $ rm my-source-repo-*-reference.tar
@@ -252,6 +253,7 @@
       fncache: true
       generaldelta: true
       plain-cl-delta: true
+      sidedata: false
       sparserevlog: true
     id: my-source-repo
     repo-prefix: my-source-repo-1a2b3c4d
diff --git a/tests/test-validate-repos.t b/tests/test-validate-repos.t
--- a/tests/test-validate-repos.t
+++ b/tests/test-validate-repos.t
@@ -32,11 +32,11 @@
   $ make-reference ../some-dir/source_A repo4test_A p-config.yaml
   hg cloning repository from: ../some-dir/source_A
   building a reference tarball
-  result available at: repo4test_A-17702431-reference.tar
+  result available at: repo4test_A-d876cf13-reference.tar
   $ make-reference ../some-dir/source_B repo4test_B p-config.yaml
   hg cloning repository from: ../some-dir/source_B
   building a reference tarball
-  result available at: repo4test_B-67049247-reference.tar
+  result available at: repo4test_B-f8dfa2ee-reference.tar
   $ cd ..
 
 Unbundle local reference
@@ -71,13 +71,13 @@
   $ cd partials-one
 
   $ make-partial-repos ../local-references/repo4test_A-*.benchrepo
-  Cloning repo4test_A (../local-references/repo4test_A-17702431-reference stripped of last(all(), 10)) into ./repo4test_A-17702431-partial-missing-last-10 (for exchange benchmarks)
-  Cloning repo4test_A (../local-references/repo4test_A-17702431-reference stripped of None) into ./repo4test_A-17702431-partial-same (for exchange benchmarks)
+  Cloning repo4test_A (../local-references/repo4test_A-d876cf13-reference stripped of last(all(), 10)) into ./repo4test_A-d876cf13-partial-missing-last-10 (for exchange benchmarks)
+  Cloning repo4test_A (../local-references/repo4test_A-d876cf13-reference stripped of None) into ./repo4test_A-d876cf13-partial-same (for exchange benchmarks)
   $ ls -1
-  repo4test_A-17702431-partial-missing-last-10
-  repo4test_A-17702431-partial-missing-last-10.tar
-  repo4test_A-17702431-partial-same
-  repo4test_A-17702431-partial-same.tar
+  repo4test_A-d876cf13-partial-missing-last-10
+  repo4test_A-d876cf13-partial-missing-last-10.tar
+  repo4test_A-d876cf13-partial-same
+  repo4test_A-d876cf13-partial-same.tar
   $ hg -R ../local-references/repo4test_A-*-reference tip -T '{rev}:{node}\n'
   52:99cae3713489c109d3f91f755bd6d6ea0363d0d5
   $ hg -R repo4test_A-*-partial-missing-last-10 tip -T '{rev}:{node}\n'
@@ -96,11 +96,11 @@
 
   $ cd partials-one
   $ validate-repos .
-  ./repo4test_A-17702431-partial-missing-last-10:
+  ./repo4test_A-d876cf13-partial-missing-last-10:
       fncache: ok
       tip: ok
   
-  ./repo4test_A-17702431-partial-same:
+  ./repo4test_A-d876cf13-partial-same:
       fncache: ok
       tip: ok
   
@@ -115,14 +115,14 @@
   $ cd ../../..
 
   $ wc -c ./repo4test_A-*-partial-missing-last-10/.hg/store/fncache
-  0 ./repo4test_A-17702431-partial-missing-last-10/.hg/store/fncache
+  0 ./repo4test_A-d876cf13-partial-missing-last-10/.hg/store/fncache
 
   $ validate-repos .
-  ./repo4test_A-17702431-partial-missing-last-10:
+  ./repo4test_A-d876cf13-partial-missing-last-10:
       fncache: KO
       tip: ok
   
-  ./repo4test_A-17702431-partial-same:
+  ./repo4test_A-d876cf13-partial-same:
       fncache: ok
       tip: ok
   
@@ -130,11 +130,11 @@
 
   $ rm ./repo4test_A-*-partial-missing-last-10/.hg/store/fncache
   $ validate-repos .
-  ./repo4test_A-17702431-partial-missing-last-10:
+  ./repo4test_A-d876cf13-partial-missing-last-10:
       fncache: KO
       tip: ok
   
-  ./repo4test_A-17702431-partial-same:
+  ./repo4test_A-d876cf13-partial-same:
       fncache: ok
       tip: ok
   
@@ -152,11 +152,11 @@
   53:3bee1aa8c6ea80203fb80e582e9f75f7ab9e6cfa
 
   $ validate-repos .
-  ./repo4test_A-17702431-partial-missing-last-10:
+  ./repo4test_A-d876cf13-partial-missing-last-10:
       fncache: KO
       tip: ok
   
-  ./repo4test_A-17702431-partial-same:
+  ./repo4test_A-d876cf13-partial-same:
       fncache: ok
       tip: KO