Patchwork [1,of,2,V3] revsetbenchmark: automatically finds the perf extension

login
register
mail settings
Submitter Pierre-Yves David
Date May 14, 2014, 10:07 p.m.
Message ID <2ec3ba5c35c852f8e9fe.1400105256@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/4739/
State Accepted
Headers show

Comments

Pierre-Yves David - May 14, 2014, 10:07 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1398802702 25200
#      Tue Apr 29 13:18:22 2014 -0700
# Node ID 2ec3ba5c35c852f8e9fe5ab28703088175de77a0
# Parent  d8a52ce003ac21569dae2023ecc648e7769bdb54
revsetbenchmark: automatically finds the perf extension

Before this changeset, you had to stand in the root of the mercurial repo to run
the `revsetbenchmark.py` script. Otherwise, the perf extension would not be
found a `./contrib/perf.py` and the script would crash in panic.

We now figure out the contrib directory from the location of this script. This
makes it possible to run the script from other location that the mercurial repo
root (but you still need to be in the core mercurial repository)

Patch

diff --git a/contrib/revsetbenchmarks.py b/contrib/revsetbenchmarks.py
--- a/contrib/revsetbenchmarks.py
+++ b/contrib/revsetbenchmarks.py
@@ -12,10 +12,11 @@ 
 #
 # This script also does one run of the current version of mercurial installed
 # to compare performance.
 
 import sys
+import os
 from subprocess import check_call, Popen, CalledProcessError, STDOUT, PIPE
 # cannot use argparse, python 2.7 only
 from optparse import OptionParser
 
 
@@ -40,11 +41,12 @@  def update(rev):
 def perf(revset):
     """run benchmark for this very revset"""
     try:
         output = check_output(['./hg',
                                '--config',
-                               'extensions.perf=contrib/perf.py',
+                               'extensions.perf='
+                               + os.path.join(contribdir, 'perf.py'),
                                'perfrevset',
                                revset],
                                stderr=STDOUT)
         output = output.lstrip('!') # remove useless ! in this context
         return output.strip()
@@ -77,10 +79,12 @@  parser.add_option("-f", "--file",
 
 if len(sys.argv) < 2:
     parser.print_help()
     sys.exit(255)
 
+# the directory where both this script and the perf.py extension live.
+contribdir = os.path.dirname(__file__)
 
 target_rev = args[0]
 
 revsetsfile = sys.stdin
 if options.file: