Mercurial > public > mercurial-scm > hg-stable
comparison contrib/perf.py @ 27345:98266b1d144d
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 |
comparison
equal
deleted
inserted
replaced
| 27344:43c00ca887d1 | 27345:98266b1d144d |
|---|---|
| 251 wctx.dirty() | 251 wctx.dirty() |
| 252 def d(): | 252 def d(): |
| 253 # acceptremote is True because we don't want prompts in the middle of | 253 # acceptremote is True because we don't want prompts in the middle of |
| 254 # our benchmark | 254 # our benchmark |
| 255 merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False, | 255 merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False, |
| 256 False, acceptremote=True, followcopies=True) | 256 acceptremote=True, followcopies=True) |
| 257 timer(d) | 257 timer(d) |
| 258 fm.end() | 258 fm.end() |
| 259 | 259 |
| 260 @command('perfpathcopies', [], "REV REV") | 260 @command('perfpathcopies', [], "REV REV") |
| 261 def perfpathcopies(ui, repo, rev1, rev2, **opts): | 261 def perfpathcopies(ui, repo, rev1, rev2, **opts): |
| 677 | 677 |
| 678 for fn, title in benches: | 678 for fn, title in benches: |
| 679 timer, fm = gettimer(ui, opts) | 679 timer, fm = gettimer(ui, opts) |
| 680 timer(fn, title=title) | 680 timer(fn, title=title) |
| 681 fm.end() | 681 fm.end() |
| 682 |