Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 17:40:02 +0100] rev 48653
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12062
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 17:06:01 +0100] rev 48652
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12061
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 17:00:58 +0100] rev 48651
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12060
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 16:27:13 +0100] rev 48650
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12059
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 16:23:44 +0100] rev 48649
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12058
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 16:22:10 +0100] rev 48648
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12057
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 22 Jan 2022 08:55:59 +0100] rev 48647
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12056
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 16:07:04 +0100] rev 48646
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12055
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jan 2022 20:24:35 +0100] rev 48645
test-http-bad-server: modify some `tail` call fit their goal
We want to check that we stop writing when we want to stop writing.
Differential Revision: https://phab.mercurial-scm.org/D12054
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 16:02:47 +0100] rev 48644
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12053
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 16:02:26 +0100] rev 48643
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12052
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 15:52:48 +0100] rev 48642
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12051
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 15:44:15 +0100] rev 48641
test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12050
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 22 Jan 2022 01:51:28 +0100] rev 48640
test-bad-http-server: introduce sock closing when writing a pattern
Instead of using a fixed number a bytes, a very unstable method. We introduce a
new config that can define a regex. One this regex is detected, nothing after
it will be written and the socket will be closed.
Tests will be migrated to this new method in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D12049
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 22 Jan 2022 01:13:12 +0100] rev 48639
test-http-bad-server: document that the value are actually a list
I don't really expect this doc to be read a lot, but mentioning that this is a
list seems important.
Differential Revision: https://phab.mercurial-scm.org/D12048
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 12:44:39 +0100] rev 48638
test-http-bad-server: refactor the writing logic to avoid early return
Our ultimate goal is to add another way to define the connection needs to be
closed. To do so, we need the "read" code to be more unified.
Differential Revision: https://phab.mercurial-scm.org/D12047
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 11:58:55 +0100] rev 48637
test-http-bad-server: replace the default 65537 value in output
This is the default block value that we use here and it make the output overall
less readable. So we replace it with `~`
Differential Revision: https://phab.mercurial-scm.org/D12046
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 11:15:56 +0100] rev 48636
test-http-bad-server: refactor the reading logic to avoid early return
Our ultimate goal is to add another way to define the connection needs to be
closed. To do so, we need the "read" code to be more unified.
Differential Revision: https://phab.mercurial-scm.org/D12045
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 03:05:43 +0100] rev 48635
test-http-bad-server: factor code dealing with "read" in the new object
This will make sure both `read` and `readline` do the same processing and make
it simpler to update that processing in the future.
Differential Revision: https://phab.mercurial-scm.org/D12044
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 00:54:15 +0100] rev 48634
test-http-bad-server: factor code dealing with "write" in the new object
This will make sure both `sendall` and `write` do the same processing and make
it simpler to update that processing in the future.
Differential Revision: https://phab.mercurial-scm.org/D12043
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jan 2022 21:25:01 +0100] rev 48633
test-http-bad-server: unify log printing for `sendall` and `write`
The `write` function was logging before calling the function while the `sendall`
function were logging after calling the function.
We align the `write` behavior on the `sendall` behavior before unifying the
code.
Differential Revision: https://phab.mercurial-scm.org/D12042
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 01:07:50 +0100] rev 48632
test-http-bad-server: track close condition in an object
In order to make the logic more advanced, we need to unify it. To unify it, we
introduce a small object that will be responsible for tracking and enforcing
"premature socket close" conditions for both proxy object (socketproxy and
fileobjectproxy).
More logic will be moved into the object in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D12041
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 19 Jan 2022 19:14:17 +0100] rev 48631
test-http-bad-server: use more readable name for variable
This make the code more accessible overall.
Differential Revision: https://phab.mercurial-scm.org/D12040
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 02:07:13 +0100] rev 48630
test-http-bad-server: align output by using `;`
This is the only message using a `,` instead of `;` and that seems
unintentional. I am unifying the message before unigying the code.
Differential Revision: https://phab.mercurial-scm.org/D12039
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 19 Jan 2022 19:04:55 +0100] rev 48629
test-http-bad-server: highlight each test with section
Small "documentation" change to highlight each individual tests better.
Differential Revision: https://phab.mercurial-scm.org/D12038
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jan 2022 20:50:40 +0100] rev 48628
test-http-bad-server: rename config to use `-`
This make things much more readable.
Differential Revision: https://phab.mercurial-scm.org/D12037
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 18 Jan 2022 21:29:43 +0100] rev 48627
test-http-bad-server: move the extension in `testlib`
This seems like a better location for it.
Differential Revision: https://phab.mercurial-scm.org/D12036
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 17 Jan 2022 19:29:41 +0100] rev 48626
requirements: remove the `localrepo.supportedformat` attribute
It is not longer used anywhere.
Differential Revision: https://phab.mercurial-scm.org/D12035
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 17 Jan 2022 22:48:16 +0100] rev 48625
requirements: sort _basesupported
This will make the next changeset clearer.
Differential Revision: https://phab.mercurial-scm.org/D12034
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 17 Jan 2022 19:28:10 +0100] rev 48624
requirements: move the comment about manifestv2 in the module
This is about requirements, so lets put it into the requirements module.
We are about to remove code it was previously attached too.
Differential Revision: https://phab.mercurial-scm.org/D12033
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 17 Jan 2022 19:26:36 +0100] rev 48623
stream-clone: add a explicit set list requirements relevant to stream clone
This set explicitly lists all the requirements that "stream clone" will
preserve. Any other one will not be preserved.
The role of listing the relevant one was previously filled by
`repo.supportedformat`, but it seems clearer to use that such global and
explicit set. The `repo.supportedformat` attribute will be cleaned up in a later
changeset
The true meaning of `repo.supportedformat` vs `repo._basesupported` was lost
over time so, the content is currently bad. For example, `dirstate-v2` is
currently considered relevant to the stream clone, or internal phase is
missing. We kept the same content in this changeset and we will fix them later.
Differential Revision: https://phab.mercurial-scm.org/D12032
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jan 2022 11:49:06 +0100] rev 48622
stream-clone: filter possible missing requirements using all supported one
The `supportedformat` requirements is missing some important requirements and it
seems better to filter out with all requirements we know, not just an
"arbitrary" subset.
This is especially relevant as we about to phase out the `supportedformat` class
attribute.
(a backport of this change to stable should be sent soon).
Differential Revision: https://phab.mercurial-scm.org/D12031
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 17 Jan 2022 19:18:20 +0100] rev 48621
requirements: move "bookmark in store" requirements in the right module
There seems to be no reasons to not have it with the others.
Differential Revision: https://phab.mercurial-scm.org/D12030
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 17 Jan 2022 18:51:47 +0100] rev 48620
stream-clone: add a explicit test for format change during stream clone
They are different kind of requirements, the one which impact the data storage
and are relevant to the files being streamed and the one which does not. For
example some requirements are only relevant to the working copy, like sparse, or
dirstate-v2.
Since they are irrelevant to the content being streamed, they do not prevent the
receiving side to use streaming clone and mercurial skip adverting them over
the wire and, ideally, within the bundle.
In addition, this let the client decide to use whichever format it desire for
the part that does not affect the store itself. So the configuration related to
these format are used as normal when doing a streaming clone.
In practice, the feature was not really tested and is badly broken with bundle-2,
since the requirements are not filtered out from the stream bundle.
So we start with adding simple tests as a good base before the fix and adjust
the feature.
Differential Revision: https://phab.mercurial-scm.org/D12029
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jan 2022 18:02:25 +0100] rev 48619
stream-clone: factor computation of requirement of a stream clone
This gather code duplicated in multiple place and will make it easier to modify
it safely in the future.
Differential Revision: https://phab.mercurial-scm.org/D12028
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jan 2022 17:57:49 +0100] rev 48618
stream-clone: factor computation of new clone requirement out
This gather code duplicated in multiple place and will make it easier to modify
it safely in the future.
Differential Revision: https://phab.mercurial-scm.org/D12027
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 18 Jan 2022 00:07:43 +0100] rev 48617
stream-clone: drop some outdated lines in test-stream-bundle-v2.t
These line refer to a "dirstate-v2" variant that is no longer in use. The
associated line drifted out of sync with reality.
Differential Revision: https://phab.mercurial-scm.org/D12026
Martin von Zweigbergk <martinvonz@google.com> [Mon, 24 Jan 2022 08:35:14 -0800] rev 48616
relnotes: add note about changed labels texts
Differential Revision: https://phab.mercurial-scm.org/D12085
Martin von Zweigbergk <martinvonz@google.com> [Fri, 21 Jan 2022 13:48:48 -0800] rev 48615
graft: attempt to make merge labels more helpful
Differential Revision: https://phab.mercurial-scm.org/D12025
Martin von Zweigbergk <martinvonz@google.com> [Fri, 21 Jan 2022 13:49:11 -0800] rev 48614
shelve: attempt to make merge labels more helpful
Differential Revision: https://phab.mercurial-scm.org/D12024
Martin von Zweigbergk <martinvonz@google.com> [Fri, 21 Jan 2022 13:48:18 -0800] rev 48613
histedit: attempt to make merge labels more helpful
Differential Revision: https://phab.mercurial-scm.org/D12023
Martin von Zweigbergk <martinvonz@google.com> [Tue, 18 Jan 2022 13:23:49 -0800] rev 48612
update: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12022
Martin von Zweigbergk <martinvonz@google.com> [Tue, 18 Jan 2022 15:04:55 -0800] rev 48611
merge: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12021
Martin von Zweigbergk <martinvonz@google.com> [Tue, 18 Jan 2022 14:57:15 -0800] rev 48610
rebase: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12020
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 11:06:52 -0800] rev 48609
simplemerge: take over formatting of label from `filemerge`
The padding we do of conflict labels depends on which conflict marker
style is used. For two-way conflict markers (the default), the length
of the base label shouldn't matter. It does before this patch,
however. This patch moves the formatting from `filemerge` to
`simplemerge`. The latter knows which conflict marker style to use, so
it can easily decide about the padding.
This change will allow us to use more descriptive "base" labels
without causing illogical padding in 2-way markers. I'll do that next.
One wrinkle is that we pass the same labels to external merge tools. I
decided to change that in this patch to be simpler: no padding, and no
ellipsis to fit within 80 columns. My reasoning is that the typical
external, 3-or-4-panel merge tool doesn't show the labels on top of
each others, so the padding doesn't make sense there. The ellipsis is
probably not necessary because the external tools probably have their
own way of dealing with long labels. Also, we limit them to "80 - 8"
to fit the "<<<<<<< " before, which is almost definitely not what an
external tool would put there.
Differential Revision: https://phab.mercurial-scm.org/D12019
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 16:16:05 -0800] rev 48608
filemerge: pass `simplemerge.MergeInput` to tool functions
Differential Revision: https://phab.mercurial-scm.org/D12018
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 14:42:50 -0800] rev 48607
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
We currently pass around pairs of file context objects and labels
between functions in the `filemerge` module. I plan to pass around
`simplemerge.MergeInput` instead. This patch prepares for that by
using the type internally in `filemerge.filemerge()`.
Differential Revision: https://phab.mercurial-scm.org/D12017
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 14:13:12 -0800] rev 48606
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 13:43:43 -0800] rev 48605
filemerge: set default labels a little earlier
By setting the default labels a little earlier, we can rely on them
always being set, as far as I can tell. It may actually even be fine
to rely on that even if we don't set them earlier, but it makes more
sense to me to do it.
Differential Revision: https://phab.mercurial-scm.org/D12015
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 11:17:09 -0800] rev 48604
filemerge: remove unused arguments from `_merge()`
Differential Revision: https://phab.mercurial-scm.org/D12014
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 11:00:30 -0800] rev 48603
simplemerge: take arguments as annotated context objects
The labels we put in conflict markers are formatted so the part before
the ':' (typically says things like "local") is padded so the ':' is
aligned among the labels. That means that if you specify a long label
for "base" but the conflict marker style is "merge" (i.e. 2-way), the
other two will have unwanted padding. We often don't specify a label
for the base, so we don't notice the problem (and it may very well be
that it didn't exist before my D11972).
I think the best fix is to pass the labels along with the context
objects, so the low-level code that switches on the marker style to
use (i.e. `simplemerge`) can do the formatting. This patch starts
doing that by passing a fully-formatted label to `simplemerge`. A
coming patch will move the formatting to `simplemerge`.
Differential Revision: https://phab.mercurial-scm.org/D12013
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 09:04:39 -0800] rev 48602
filemerge: make `labels` a required arg for `_premerge()`
We always pass labels, and it's always a non-empty list, so we can
simplify a bit.
Differential Revision: https://phab.mercurial-scm.org/D12012
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 14:46:16 -0800] rev 48601
filemerge: remove unnecessary check for empty string
Looking at the statement just before, the string is clearly never
empty (or otherwise falsy).
Differential Revision: https://phab.mercurial-scm.org/D12011
Martin von Zweigbergk <martinvonz@google.com> [Thu, 20 Jan 2022 23:07:35 -0800] rev 48600
tests: also test spaces in conflict marker labels
Our fake merge tool printed the arguments using `$1` etc. without
quotes, which means that the shell collapsed repeated spaces within
the argument. That resulted in tests that did not pick up changes to
the number of spaces.
Differential Revision: https://phab.mercurial-scm.org/D12010
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 17 Jan 2022 21:20:46 -0500] rev 48599
blackbox: change year in logs to ISO 8601 format
AFAIK, year/month/day is not a format than anyone uses. It seems more
sensible to me to use ISO 8601, as that's standard and unambiguously
year-month-day.
Compatibility-wise, I think it's acceptable to change the default
format. It's most for human consumption. It's plausible that a few
tools parse this format, but it has already changed in the past (for
instance to add the current revision).
Differential Revision: https://phab.mercurial-scm.org/D12006
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 17 Jan 2022 21:00:33 -0500] rev 48598
blackbox: add milliseconds to blackbox logs by default
The current second granularity is often not specific enough to
determine whether an hg command is happening before or after some
other event.
Given that starting a process takes on the order of 1ms (well, for
native processes. It's quite a bit more for python processes),
microseconds seems like unnecessary noise.
This also lines up behavior with the rust version, where we already
switched to millisecond precision.
Differential Revision: https://phab.mercurial-scm.org/D12005
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 17 Jan 2022 20:47:46 -0500] rev 48597
blackbox: correct date format doc
Differential Revision: https://phab.mercurial-scm.org/D12004
Raphaël Gomès <rgomes@octobus.net> [Tue, 18 Jan 2022 10:27:13 +0100] rev 48596
branching: merge with stable
Simon Sapin <simon.sapin@octobus.net> [Mon, 17 Jan 2022 12:50:13 +0100] rev 48595
rust: Fix outdated comments in OwningDirstateMap
OwningDirstateMap used to own a PyBytes, but was generalized to be
more generic when it was moved from hg-cpython to hg-core.
This fixes some comments that were still referencing PyBytes.
Differential Revision: https://phab.mercurial-scm.org/D12003
Martin von Zweigbergk <martinvonz@google.com> [Fri, 14 Jan 2022 09:28:44 -0800] rev 48594
merge: consider the file merged when using :merge-{local,other}
Returning `None` from `simplemerge()` means that the caller interprets
it as "no merge was necessary (because two sides matched)". See
6217040b2780 and issue2680 for some background. However,
`simplemerge()` shouldn't even get called in such scenarios, and
returning `None` means that the file is not considered merged, even
though the contents actually were. See the affected test cases.
Differential Revision: https://phab.mercurial-scm.org/D11999
Martin von Zweigbergk <martinvonz@google.com> [Fri, 14 Jan 2022 08:44:36 -0800] rev 48593
simplemerge: delete unused exception class `CantReprocessAndShowBase`
The only user was removed in f18830651811 (simplemerge: burn "minimal"
feature to the ground, 2014-08-05).
Differential Revision: https://phab.mercurial-scm.org/D11998
Martin von Zweigbergk <martinvonz@google.com> [Tue, 11 Jan 2022 22:13:56 -0800] rev 48592
simplemerge: change _minimize() to minimize a single conflict
`_minimize()` is weird in that it changes `a_lines` and `b_lines` but
leaves `base_lines` unchanged, which means they'll be
inconsistent. That was fine because the caller never used
`base_lines`. With the recent refactorings of this code, we can now
make this function cleaner by having it minimize a single conflict and
not care about `base_lines`.
This also makes the code simpler and makes the code for each
`render_*()` function more similar.
Differential Revision: https://phab.mercurial-scm.org/D11981
Martin von Zweigbergk <martinvonz@google.com> [Tue, 11 Jan 2022 22:03:55 -0800] rev 48591
simplemerge: make minimize() a free function
IMO, `Merge3Text` should be about merging text without knowing about
conflict markers. "Conflict minimization" is about making conflict
markers smaller, so it should be moved out. This patch does that. I'll
refactor it next.
Differential Revision: https://phab.mercurial-scm.org/D11980
Martin von Zweigbergk <martinvonz@google.com> [Tue, 11 Jan 2022 21:56:27 -0800] rev 48590
simplemerge: simplify and rename `render_markers()`
`render_markers()` now always renders minimized 2-way markers, so
let's simplify and rename it accordingly.
Differential Revision: https://phab.mercurial-scm.org/D11979