pacien <pacien.trangirard@pacien.net> [Fri, 10 Dec 2021 15:27:22 +0100] rev 48518
hg-cpython: implement vcsgraph::Graph for our Index
Differential Revision: https://phab.mercurial-scm.org/D11946
pacien <pacien.trangirard@pacien.net> [Fri, 10 Dec 2021 15:22:24 +0100] rev 48517
rust: add vcsgraph crate as dependency
Preparing the integration of the vcsgraph library, which will provide generic
algorithms for computations on version control graphs.
Differential Revision: https://phab.mercurial-scm.org/D11945
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 23:01:20 -0800] rev 48516
simplemerge: don't calculate conflict labels when resolving automatically
Differential Revision: https://phab.mercurial-scm.org/D11903
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 22:45:31 -0800] rev 48515
simplemerge: remove now-unused `localorother` argument from `merge_lines()`
Differential Revision: https://phab.mercurial-scm.org/D11902
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 22:33:18 -0800] rev 48514
simplemerge: add a specialized function for "union", "local", "other"
Differential Revision: https://phab.mercurial-scm.org/D11901
Simon Sapin <simon.sapin@octobus.net> [Sat, 18 Dec 2021 11:47:03 +0100] rev 48513
rhg: Fall back to Python if verbose status is requested by config
Differential Revision: https://phab.mercurial-scm.org/D11943
Simon Sapin <simon.sapin@octobus.net> [Fri, 17 Dec 2021 17:56:13 +0100] rev 48512
rhg: Accept different "invalid ignore pattern" error message formatting
At the moment rhg compiles all patterns into a single big regular expression,
so it’s not practical to find out which file the invalid bit of syntax
came from.
Differential Revision: https://phab.mercurial-scm.org/D11942
Simon Sapin <simon.sapin@octobus.net> [Fri, 17 Dec 2021 16:54:22 +0100] rev 48511
rhg: Properly format warnings related to ignore patterns
Differential Revision: https://phab.mercurial-scm.org/D11941
Simon Sapin <simon.sapin@octobus.net> [Tue, 09 Nov 2021 18:17:52 +0100] rev 48510
rhg: Sub-repositories are not supported
Differential Revision: https://phab.mercurial-scm.org/D11940
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 17:48:50 -0800] rev 48509
simplemerge: make `localorother` a "mode" instead of a separate thing
`simplemerge()` takes a `mode` argument, which can be "union", "merge"
or "mergediff", and a `localorother` argument, which can be `None`,
"local", or "other". The two options are not at all orthogonal -- most
combinations don't make sense. Also, at least "union", "local", and
"other" are very closely related. Therefore, it makes sense to combine
them into one.
It probably makes sense to split the `mode` argument into `resolve`
and `marker_style`, where the former can be `None`, "union", "local",
or "other", and the latter can be "merge", "merge3", "mergediff", or
"minimize". This is a good step in that direction whether or not we
end up doing that.
Differential Revision: https://phab.mercurial-scm.org/D11887