Martin von Zweigbergk <martinvonz@google.com> [Tue, 08 Dec 2020 13:33:40 -0800] rev 46081
status: disable morestatus when using -0
Without this patch, you get something like this:
```
M a\x00? a.orig\x00# The repository is in an unfinished *merge* state. (esc)
# Unresolved merge conflicts:
#
# a
#
# To mark files as resolved: hg resolve --mark FILE
# To continue: hg commit
# To abort: hg merge --abort
```
That doesn't seem like something one would ever want. I considered
making it an error to combine `-0` with morestatus, but it seems very
likely that that would just make the user spend time trying to figure
out how to disable morestatus, so it feels like we might as well just
do it for them.
Differential Revision: https://phab.mercurial-scm.org/D9545
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 06 Dec 2020 14:45:19 +0100] rev 46080
debugdiscovery: display some information about the initial "undecided" set
The size and shape of the revision that remains "undediced" once the fetched the
remote heads and queried the local one have a large impact on the discovery
performance, so we display some information about that set.
Differential Revision: https://phab.mercurial-scm.org/D9530
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 06 Dec 2020 06:19:15 +0100] rev 46079
debugdiscovery: add some data about the shapes of the sets
We display the number of heads and roots or the common and missing set.
Differential Revision: https://phab.mercurial-scm.org/D9529
Matt Harbison <matt_harbison@yahoo.com> [Mon, 07 Dec 2020 21:44:00 -0500] rev 46078
tests: conditionalize the progress timestamp for Windows
It looks like for py2 on Windows, the start date is 1970. It matches the other
platforms for py3, so I'm just going to match the tests and move on, given that
py2 is on the way out.
Differential Revision: https://phab.mercurial-scm.org/D9541
Matt Harbison <matt_harbison@yahoo.com> [Mon, 07 Dec 2020 20:38:00 -0500] rev 46077
tests: conditionalize a few Windows specific error messages
Differential Revision: https://phab.mercurial-scm.org/D9540
Matt Harbison <matt_harbison@yahoo.com> [Mon, 07 Dec 2020 20:32:05 -0500] rev 46076
tests: correct the output order about starting a background thread for Windows
I didn't track down where this change occurred. I assume it's related to some
buffering changes, and/or an explicit flush somewhere.
Differential Revision: https://phab.mercurial-scm.org/D9539
Matt Harbison <matt_harbison@yahoo.com> [Mon, 07 Dec 2020 20:57:50 -0500] rev 46075
tests: update the exit status codes for Windows specific tests
This corresponds to 527ce85c2e60, ebee234d952a, and 568c05d8f3d2.
Differential Revision: https://phab.mercurial-scm.org/D9538
Matt Harbison <matt_harbison@yahoo.com> [Mon, 07 Dec 2020 20:53:01 -0500] rev 46074
tests: drop the trailing exclamation point from some Windows abort messages
This likely goes with 95c4cca641f6.
Differential Revision: https://phab.mercurial-scm.org/D9537