changeset 30346:7ddc8f8d7712

perf: support bdiffing multiple revisions in a single revlog This is useful for testing bdiff performance on several revision pairs at a time.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 06 Nov 2016 11:01:25 -0800
parents 7d91a085ebe6
children 6ecad4b73569
files contrib/perf.py tests/test-contrib-perf.t
diffstat 2 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/perf.py	Sun Nov 06 09:51:14 2016 -0800
+++ b/contrib/perf.py	Sun Nov 06 11:01:25 2016 -0800
@@ -747,9 +747,17 @@
     timer(d)
     fm.end()
 
-@command('perfbdiff', revlogopts + formatteropts, '-c|-m|FILE REV')
-def perfbdiff(ui, repo, file_, rev=None, **opts):
-    """benchmark a bdiff between a revision and its delta parent"""
+@command('perfbdiff', revlogopts + formatteropts + [
+    ('', 'count', 1, 'number of revisions to test (when using --startrev)')],
+    '-c|-m|FILE REV')
+def perfbdiff(ui, repo, file_, rev=None, count=None, **opts):
+    """benchmark a bdiff between revisions
+
+    By default, benchmark a bdiff between its delta parent and itself.
+
+    With ``--count``, benchmark bdiffs between delta parents and self for N
+    revisions starting at the specified revision.
+    """
     if opts.get('changelog') or opts.get('manifest'):
         file_, rev = None, file_
     elif rev is None:
@@ -759,10 +767,10 @@
 
     r = cmdutil.openrevlog(repo, 'perfbdiff', file_, opts)
 
-    node = r.lookup(rev)
-    rev = r.rev(node)
-    dp = r.deltaparent(rev)
-    textpairs.append((r.revision(dp), r.revision(node)))
+    startrev = r.rev(r.lookup(rev))
+    for rev in range(startrev, min(startrev + count, len(r) - 1)):
+        dp = r.deltaparent(rev)
+        textpairs.append((r.revision(dp), r.revision(rev)))
 
     def d():
         for pair in textpairs:
--- a/tests/test-contrib-perf.t	Sun Nov 06 09:51:14 2016 -0800
+++ b/tests/test-contrib-perf.t	Sun Nov 06 11:01:25 2016 -0800
@@ -50,7 +50,7 @@
    perfancestorset
                  (no help text available)
    perfannotate  (no help text available)
-   perfbdiff     benchmark a bdiff between a revision and its delta parent
+   perfbdiff     benchmark a bdiff between revisions
    perfbranchmap
                  benchmark the update of a branchmap
    perfcca       (no help text available)