Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/perf: fix perfmergecalculate
authortimeless <timeless@mozdev.org>
Tue, 24 Nov 2015 21:44:16 +0000
changeset 27098 64cb281d23a5
parent 27097 b3e24a9c5f9b
child 27099 e94bfebb4f35
contrib/perf: fix perfmergecalculate merge.calculateupdates requires an array of ancestors and followcopies
contrib/perf.py file | annotate | diff | comparison | revisions 
--- a/contrib/perf.py	Tue Nov 24 22:01:11 2015 +0000
+++ b/contrib/perf.py	Tue Nov 24 21:44:16 2015 +0000
@@ -239,8 +239,8 @@
     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, False,
-                               acceptremote=True)
+        merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False,
+                               False, acceptremote=True, followcopies=True)
     timer(d)
     fm.end()
mercurial