Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Dec 2021 10:03:00 +0100] rev 48435
upgrade: don't use `dd status=none` in the test
This breaks on Windows, so lets use `>2 /dev/null` like in the other tests.
Differential Revision: https://phab.mercurial-scm.org/D11873
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 06 Dec 2021 10:23:51 +0100] rev 48434
test-upgrade: narrow the `debugformat` call when upgrading to dirstate-v2
This will make the test less noisy when new requirement are added.
Differential Revision: https://phab.mercurial-scm.org/D11864
Martin von Zweigbergk <martinvonz@google.com> [Mon, 06 Dec 2021 12:30:54 -0800] rev 48433
filemerge: remove `premerge` argument from `_makebackup()`
We now always pass `True`, so there's no need to pass it.
Differential Revision: https://phab.mercurial-scm.org/D11863
Martin von Zweigbergk <martinvonz@google.com> [Fri, 03 Dec 2021 22:45:35 -0800] rev 48432
filemerge: inline `_filemerge()` into `filemerge()`
The caller is now trivial, so the indirection is pointless.
Differential Revision: https://phab.mercurial-scm.org/D11860
Martin von Zweigbergk <martinvonz@google.com> [Fri, 03 Dec 2021 21:41:43 -0800] rev 48431
filemerge: make `_filemerge()` do both premerge and merge
This patch removes the `premerge` argument from `_filemerge()` and
makes it do both the "premerge" and "merge" steps without the caller
having to call it twice.
Differential Revision: https://phab.mercurial-scm.org/D11859
Martin von Zweigbergk <martinvonz@google.com> [Fri, 03 Dec 2021 16:21:46 -0800] rev 48430
filemerge: merge `premerge()` into `filemerge()`
Differential Revision: https://phab.mercurial-scm.org/D11858
Martin von Zweigbergk <martinvonz@google.com> [Fri, 03 Dec 2021 15:43:54 -0800] rev 48429
mergestate: inline `_resolve()` into `resolve()`
The caller is now trivial, so the indirection is pointless.
Differential Revision: https://phab.mercurial-scm.org/D11857
Martin von Zweigbergk <martinvonz@google.com> [Fri, 03 Dec 2021 13:53:02 -0800] rev 48428
mergestate: make `_resolve()` do both preresolve and resolve
This patch removes the `preresolve` argument from `_resolve()` and
makes it do both the "preresolve" and "resolve" steps without the
caller having to call it twice.
Differential Revision: https://phab.mercurial-scm.org/D11856
Martin von Zweigbergk <martinvonz@google.com> [Thu, 02 Dec 2021 22:59:36 -0800] rev 48427
mergestate: merge `preresolve()` into `resolve()`
The separation between `preresolve()` and `resolve()` was something
added for the "merge driver" feature. Since we removed that in
32ce4cbaec4b (mergedriver: delete it, 2020-09-17), we don't need the
separation anymore. More cleanups will follow.
Differential Revision: https://phab.mercurial-scm.org/D11855
Martin von Zweigbergk <martinvonz@google.com> [Fri, 03 Dec 2021 21:50:25 -0800] rev 48426
tests: remove unnecessary explicit args from `failfilemerge.py`
The `failfilemerge()` function always raises an exception without
looking at its arguments, so let's use `*args` and `**kwargs`.
Differential Revision: https://phab.mercurial-scm.org/D11854