Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 30 Dec 2021 13:25:44 +0100] rev 48525
rust: fix build errors on darwin
I'm not all _that_ versed in Rust, but I think the root cause is that
some constants are u16 rather than u32 on Darwin. I checked that the
code still compiles on the latest Ubuntu.
Differential Revision: https://phab.mercurial-scm.org/D11955
Augie Fackler <augie@google.com> [Tue, 04 Jan 2022 14:21:22 -0500] rev 48524
merge: with stable
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Fri, 15 Feb 2019 17:20:32 -0500] rev 48523
help: properly document the default pattern
The default isn't to glob. It's relpath, which does no globbing at
all. Thus most commands and options like -X/-I and hg files require
`glob:` in front of them to actually do any globbing.
I think long ago the default was to glob, but that hasn't been true
for a long time.
Raphaël Gomès <rgomes@octobus.net> [Mon, 03 Jan 2022 10:43:17 +0100] rev 48522
heptapod-ci: make Windows jobs manual again
The dance continues, we make the Windows tests optional once again since we
don't have Windows runners available anymore. We're working on getting new ones
in a more stable fashion, hopefully soon.
Differential Revision: https://phab.mercurial-scm.org/D11957
Julien Cristau <jcristau@debian.org> [Wed, 25 Aug 2021 17:14:47 +0200] rev 48521
tests: allow for variation in zstd output as seen on s390x and powerpc
pacien <pacien.trangirard@pacien.net> [Fri, 10 Dec 2021 16:25:02 +0100] rev 48520
hg-core: dedup LazyAncestors Iterator impl
… Which has been moved to the vcsgraph crate.
AncestorsIterator cannot yet be removed because it is still being used in
hg-core.
Differential Revision: https://phab.mercurial-scm.org/D11948
pacien <pacien.trangirard@pacien.net> [Tue, 16 Nov 2021 18:54:05 +0100] rev 48519
hg-cpython: use ancestor iterator impls from vcsgraph
Differential Revision: https://phab.mercurial-scm.org/D11947
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