Matt Harbison <matt_harbison@yahoo.com> [Sat, 19 Dec 2020 01:19:02 -0500] rev 46170
mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows
Again, marginal usefulness, but other tools have this config and it eliminates a
diff from the TortoiseHg file.
Differential Revision: https://phab.mercurial-scm.org/D9634
Matt Harbison <matt_harbison@yahoo.com> [Sat, 19 Dec 2020 01:15:44 -0500] rev 46169
mergetools: enable the `checkconflicts` option for Araxis Merge
This must have been a typo. This matches the config read in filemerge, as well
as the TortoiseHg config file.
Differential Revision: https://phab.mercurial-scm.org/D9633
Matt Harbison <matt_harbison@yahoo.com> [Sat, 19 Dec 2020 01:10:57 -0500] rev 46168
mergetools: sync up comments with the TortoiseHg copy of the config file
It's of limited value, but a step towards making the diff between the two less
noisy.
Differential Revision: https://phab.mercurial-scm.org/D9632
Simon Sapin <simon.sapin@octobus.net> [Mon, 14 Dec 2020 16:33:15 +0100] rev 46167
rust: introduce Repo and Vfs types for filesystem abstraction
This is similar to the corresponding Python classes.
Repo represents a repository and knows the path to the `.hg` directory,
the `store` directory, and the working directory.
Separating these will enable supporting the share extension.
A Vfs is created from a Repo for one of these three directories.
It has filesystem access APIs that take a relative std::path::Path
as a parameter.
Differential Revision: https://phab.mercurial-scm.org/D9596
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 19 Dec 2020 15:56:54 +0100] rev 46166
bundle2: drop some outdated comment
This commend trace back to a very early bundle2 changeset c7ceae0faf69. And the
code moved past this warning over 5 years ago.
Differential Revision: https://phab.mercurial-scm.org/D9637
Joerg Sonnenberger <joerg@bec.de> [Fri, 24 Apr 2020 16:36:04 +0200] rev 46165
bundle: optional advisory obsolescence parts
It is useful to ship obsolescence markers as part of clonebundles or
pullbundles, but they shouldn't stop a non-evolution client from working.
Differential Revision: https://phab.mercurial-scm.org/D8480
Martin von Zweigbergk <martinvonz@google.com> [Thu, 17 Dec 2020 09:35:07 -0800] rev 46164
relnotes: document that `hg extdiff` also got -r replaced by --from/--to
Differential Revision: https://phab.mercurial-scm.org/D9628
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 14 Dec 2020 17:22:11 +0100] rev 46163
hghave: add some official category for known-bad and missing-good output
This will make it simple to tag output that are expected to changes. A simple
hghave integration seems enough but smarter behavior around these seems possible
in the future.
Differential Revision: https://phab.mercurial-scm.org/D9607
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 14 Dec 2020 01:32:22 +0100] rev 46162
copies: rename value/other variable to minor/major for clarity
Differential Revision: https://phab.mercurial-scm.org/D9591
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 14 Dec 2020 01:30:32 +0100] rev 46161
copies: extract value comparison in the python copy tracing
This mirror what we did in the Rust code. This is useful to prepare rework for
this comparison logic that we will need to handle more advanced chaining cases
(when merges are chained).
Differential Revision: https://phab.mercurial-scm.org/D9590