diff --git a/benchmarks/basic_commands.py b/benchmarks/basic_commands.py index 5c23bd930d5cda7072a34ef63d3ca07792e5b9ae_YmVuY2htYXJrcy9iYXNpY19jb21tYW5kcy5weQ==..b29d146ce714e64110283f09f5c18afeff984397_YmVuY2htYXJrcy9iYXNpY19jb21tYW5kcy5weQ== 100644 --- a/benchmarks/basic_commands.py +++ b/benchmarks/basic_commands.py @@ -241,7 +241,7 @@ if repo_type == 'http' and self.get_asv_rev() in self.get_skip()['hgweb']: raise NotImplementedError repo_suffix = urllib.quote_plus(strip) - self.clone_path = os.path.join(REPOS_DIR, '.cache', 'partial-{}-{}'.format( + self.clone_path = os.path.join(REPOS_DIR, '.cache', '{}-partial-{}'.format( repo_name, repo_suffix)) if revset is not None: self.rev = self.hg('identify', '-i', '-r', revset).strip() diff --git a/clone_repos.py b/clone_repos.py deleted file mode 100644 index 5c23bd930d5cda7072a34ef63d3ca07792e5b9ae_Y2xvbmVfcmVwb3MucHk=..0000000000000000000000000000000000000000 --- a/clone_repos.py +++ /dev/null @@ -1,24 +0,0 @@ -""" Ensure that all repository are cloned and at their tip -""" -import hglib -from os.path import isdir, join -import yaml - - -def read_configuration(config_path): - with open(config_path) as config_file: - return yaml.load(config_file.read()) - - -def clone_repositories(config, repos_dir): - for repo_name, repo in config["repos"].items(): - clonedir = join(repos_dir, repo_name) - if not isdir(clonedir): - print("Cloning %s (%s) into %s" % (repo_name, repo["url"], clonedir)) - hglib.clone(repo["url"], clonedir) - else: - print("Repository %s is already cloned" % repo_name) - - -config = read_configuration("config.yaml") -clone_repositories(config, "repos") diff --git a/config.yaml b/config.yaml index 5c23bd930d5cda7072a34ef63d3ca07792e5b9ae_Y29uZmlnLnlhbWw=..b29d146ce714e64110283f09f5c18afeff984397_Y29uZmlnLnlhbWw= 100644 --- a/config.yaml +++ b/config.yaml @@ -1,13 +1,3 @@ -repos: - mercurial-2017: - url: https://www.mercurial-scm.org/repo/hg/ - pypy-2017: - url: https://bitbucket.org/pypy/pypy/get/75bf1a9.zip - mozilla-central-2017: - url: https://hg.mozilla.org/mozilla-central - netbeans-2017: - url: http://hg.netbeans.org/main - # a dict of "skipped" benchmarks for features known to be broken for some # revisions skip: diff --git a/launch.sh b/launch.sh index 5c23bd930d5cda7072a34ef63d3ca07792e5b9ae_bGF1bmNoLnNo..b29d146ce714e64110283f09f5c18afeff984397_bGF1bmNoLnNo 100755 --- a/launch.sh +++ b/launch.sh @@ -8,8 +8,21 @@ python -m perf system show | grep "OK!" # Ensure all repository are here -python clone_repos.py -python create_stripped_cached_repos.py + +if [ ! -d mercurial ]; then + hg clone https://www.mercurial-scm.org/repo/hg mercurial +fi + +mkdir -p repos/ +make -f repos.make +mkdir -p repos/.cache +( + cd repos/.cache/; + ../../repo-scripts/make-partial-repos ../../partial-sets.yaml ../*.benchrepo +) + +rename 's/-reference//' repos/* + python create_skip_file.py # Launch asv diff --git a/repos.make b/repos.make new file mode 100644 index 0000000000000000000000000000000000000000..b29d146ce714e64110283f09f5c18afeff984397_cmVwb3MubWFrZQ== --- /dev/null +++ b/repos.make @@ -0,0 +1,4 @@ +SOURCE=https://static.octobus.net/asv/ + +repos/mercurial-2018-08-01.benchrepo: + (cd repos/; curl $(SOURCE)/mercurial-2018-08-01-reference.tar | tar x)