Skip to content
Snippets Groups Projects
Commit 59574c50 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

benchrepo: read the partial sets one level lower

Now that the upgrade script write them one level lower, we read it at that level. For now, it is simple to keep compatibility with the older form. So we keep it.
parent fee53b5e
No related branches found
No related tags found
No related merge requests found
......@@ -118,10 +118,10 @@
repo_ids.add(repo_id)
format_info = reference_repo.get("format-info", {})
# XXX note: this the "partial-sets" data should be a the same level as
# the "benchmark-variables" data. We should move on down or the other
# up. Moving "partial-sets" down seems preferable.
partial_sets = reference_repo.get("partial-sets", {})
partial_sets = data.get("partial-sets", {})
if not partial_sets:
# compat layer for the level transition. We can drop this later
partial_sets = reference_repo.get("partial-sets", {})
partial_sets_set.update(partial_sets)
# Add a prefix to format-info keys
......
......@@ -25,5 +25,6 @@
def clone_repositories(paths):
for refpath in paths:
refdir = os.path.dirname(refpath)
refconfig = read_yaml(refpath)["reference-repo"]
refdata = read_yaml(refpath)
refconfig = refdata["reference-repo"]
repo_name = refconfig["id"]
......@@ -29,5 +30,5 @@
repo_name = refconfig["id"]
partial_sets = refconfig["partial-sets"]
partial_sets = refdata["partial-sets"]
if not refconfig["enabled"]:
print("skipping disabled reference repository:", repo_name)
......
......@@ -144,7 +144,7 @@
# Inject partial sets into bench repo
contents = read_yaml(partial_sets_file_path)
reference_repo["partial-sets"] = contents["partial-sets"]
data["partial-sets"] = contents["partial-sets"]
# Write data to the benchrepo file
with open(repo_details, "w") as repo_details_file:
......
......@@ -105,6 +105,8 @@
# missing, it would simply reuse the information present in the reference.
partial_sets = partial_config["partial-sets"]
new_benchrepo["partial-sets"] = partial_sets
# some old version of the file has the partial_sets at the wrong level
new_benchrepo["reference-repo"].pop("partial_sets", None)
# And write it
with open(benchrepo_path, "w") as new_benchrepo_file:
......
......@@ -64,6 +64,10 @@
some-dir
$ cat my-reference-I-2b380e39.benchrepo
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
reference-repo:
enabled: true
format-info:
......@@ -85,12 +89,8 @@
number-revisions:
all: 53
visible: 53
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
repo-hash: 2b380e39
repo-prefix: my-reference-I-2b380e39
source: some-dir/my-source-repo
$ cat my-reference-I-d9c2fe76.benchrepo
......@@ -92,8 +92,12 @@
repo-hash: 2b380e39
repo-prefix: my-reference-I-2b380e39
source: some-dir/my-source-repo
$ cat my-reference-I-d9c2fe76.benchrepo
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
reference-repo:
enabled: true
format-info:
......@@ -115,10 +119,6 @@
number-revisions:
all: 53
visible: 53
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
repo-hash: d9c2fe76
repo-prefix: my-reference-I-d9c2fe76
source: some-dir/my-source-repo
......@@ -145,7 +145,9 @@
'repo-format-plain-cl-delta',
'repo-format-sparserevlog'],
8,
{'my-reference-I-2b380e39': {'reference-repo': {'enabled': True,
{'my-reference-I-2b380e39': {'partial-sets': {'missing-last-10': {'remove': 'last(all(), 10)'},
'same': None},
'reference-repo': {'enabled': True,
'format-info': {'compression': 'zlib',
'compression-level': 'default',
'dotencode': True,
......@@ -161,8 +163,6 @@
'visible': 1},
'number-revisions': {'all': 53,
'visible': 53},
'partial-sets': {'missing-last-10': {'remove': 'last(all(), 10)'},
'same': None},
'repo-hash': '2b380e39',
'repo-prefix': 'my-reference-I-2b380e39',
'source': 'some-dir/my-source-repo'}},
......@@ -166,7 +166,9 @@
'repo-hash': '2b380e39',
'repo-prefix': 'my-reference-I-2b380e39',
'source': 'some-dir/my-source-repo'}},
'my-reference-I-d9c2fe76': {'reference-repo': {'enabled': True,
'my-reference-I-d9c2fe76': {'partial-sets': {'missing-last-10': {'remove': 'last(all(), 10)'},
'same': None},
'reference-repo': {'enabled': True,
'format-info': {'compression': 'zlib',
'compression-level': 'default',
'dotencode': True,
......@@ -182,8 +184,6 @@
'visible': 1},
'number-revisions': {'all': 53,
'visible': 53},
'partial-sets': {'missing-last-10': {'remove': 'last(all(), 10)'},
'same': None},
'repo-hash': 'd9c2fe76',
'repo-prefix': 'my-reference-I-d9c2fe76',
'source': 'some-dir/my-source-repo'}}},
......
......@@ -60,6 +60,10 @@
p-config.yaml
some-dir
$ cat my-reference-*.benchrepo
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
reference-repo:
enabled: true
format-info:
......@@ -81,10 +85,6 @@
number-revisions:
all: 53
visible: 53
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
repo-hash: 0c229866
repo-prefix: my-reference-0c229866
source: some-dir/my-source-repo
......@@ -113,6 +113,10 @@
p-config.yaml
some-dir
$ cat my-reference-*.benchrepo
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
reference-repo:
enabled: true
format-info:
......@@ -134,10 +138,6 @@
number-revisions:
all: 53
visible: 53
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
repo-hash: 0c229866
repo-prefix: my-reference-0c229866
source: some-dir/my-source-repo
......@@ -228,6 +228,10 @@
--------------------
$ EDITOR=cat update-reference-config my-reference-*-reference.tar
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
reference-repo:
enabled: true
format-info:
......@@ -249,10 +253,6 @@
number-revisions:
all: 53
visible: 53
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
repo-hash: 0c229866
repo-prefix: my-reference-0c229866
source: some-dir/my-source-repo
......@@ -268,6 +268,10 @@
$ tar xf ../my-reference-*-reference.tar --wildcards "my-reference-*.benchrepo"
$ cat my-reference-*.benchrepo
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
reference-repo:
enabled: true
format-info:
......@@ -289,10 +293,6 @@
number-revisions:
all: 53
visible: 53
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
repo-hash: 0c229866
repo-prefix: my-reference-0c229866
source: some-dir/my-other-source-repo
......@@ -325,6 +325,10 @@
p-config.yaml
some-dir
$ cat my-reference-*.benchrepo
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
reference-repo:
enabled: true
format-info:
......@@ -346,10 +350,6 @@
number-revisions:
all: 53
visible: 53
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
repo-hash: 0c229866
repo-prefix: my-reference-0c229866
source: some-dir/my-source-repo
......@@ -395,6 +395,10 @@
sparse-revlog-hgrc
$ cat my-reference-*.benchrepo
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
reference-repo:
enabled: true
format-info:
......@@ -416,10 +420,6 @@
number-revisions:
all: 53
visible: 53
partial-sets:
missing-last-10:
remove: last(all(), 10)
same: null
repo-hash: 8e2c7069
repo-prefix: my-reference-8e2c7069
source: some-dir/my-source-repo
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment