perf: allow to specify the base of the merge in perfmergecalculate

We can now test the rebase case.

contrib/perf.py

@@ -967,6 +967,7 b' def perfdirstatewrite(ui, repo, **opts):'
          [
              (b'r', b'rev', b'.', b'rev to merge against'),
              (b'', b'from', b'', b'rev to merge from'),
+             (b'', b'base', b'', b'the revision to use as base'),
          ] + formatteropts)
 def perfmergecalculate(ui, repo, rev, **opts):
     opts = _byteskwargs(opts)
@@ -981,6 +982,10 b' def perfmergecalculate(ui, repo, rev, **'
         # prime that cache
         wctx.dirty()
     rctx = scmutil.revsingle(repo, rev, rev)
+    if opts['base']:
+        fromrev = scmutil.revsingle(repo, opts['base'])
+        ancestor = repo[fromrev]
+    else:
     ancestor = wctx.ancestor(rctx)
     def d():
         # acceptremote is True because we don't want prompts in the middle of
@@ -989,6 +994,13 b' def perfmergecalculate(ui, repo, rev, **'
                                acceptremote=True, followcopies=True)
     timer(d)
     fm.end()
+    def d():
+        # acceptremote is True because we don't want prompts in the middle of
+        # our benchmark
+        merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False,
+                               acceptremote=True, followcopies=True)
+    timer(d)
+    fm.end()
 
 @command(b'perfpathcopies', [], b"REV REV")
 def perfpathcopies(ui, repo, rev1, rev2, **opts):