Mercurial > hg

diff contrib/perf.py @ 27345:98266b1d144d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: restate calculateupdates in terms of a matcher Once we get a matcher down into manifestmerge, we can make narrowhg work more easily and potentially let manifest.match().diff() do less work in manifestmerge.
author Augie Fackler <augie@google.com>
date Mon, 14 Dec 2015 20:37:41 -0500
parents 7bc52ac46172
children de7bcbc68042
line wrap: on
line diff
--- a/contrib/perf.py	Mon Dec 14 18:54:03 2015 -0500
+++ b/contrib/perf.py	Mon Dec 14 20:37:41 2015 -0500
@@ -253,7 +253,7 @@
         # acceptremote is True because we don't want prompts in the middle of
         # our benchmark
         merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False,
-                               False, acceptremote=True, followcopies=True)
+                               acceptremote=True, followcopies=True)
     timer(d)
     fm.end()
 
@@ -679,4 +679,3 @@
         timer, fm = gettimer(ui, opts)
         timer(fn, title=title)
         fm.end()
-