- Feb 16, 2022
-
-
Martin von Zweigbergk authored
-
- Feb 15, 2022
-
-
Raphaël Gomès authored
Differential Revision: https://phab.mercurial-scm.org/D12183
-
Mathias De Mare authored
Differential Revision: https://phab.mercurial-scm.org/D12182
-
- Feb 14, 2022
-
-
Mathias De Mare authored
Differential Revision: https://phab.mercurial-scm.org/D12172
-
- Feb 07, 2022
-
-
Martin von Zweigbergk authored
The `ui` argument is no longer needed now that we don't handle `--print` in the library code. Differential Revision: https://phab.mercurial-scm.org/D12151
-
- Jan 14, 2022
-
-
Martin von Zweigbergk authored
The `mercurial.simplemerge` module still has some command-lines processing that doesn't belong in such a low-level module. This patch moves the handling of `hg simplemerge --print` to the extension by having `mercurial.simplemerge.simplemerge()` return the merged text. Differential Revision: https://phab.mercurial-scm.org/D12148
-
- Feb 10, 2022
-
-
Martin von Zweigbergk authored
The `simplemerge` module does too much UI-related things. This patch puts a specialized copy of `simplemerge._verifytext()` in the simplemerge extension. Differential Revision: https://phab.mercurial-scm.org/D12146
-
Martin von Zweigbergk authored
The `simplemerge` module is library code; it should not get an unmodified `opts` dict from the `simplemerge` extension. Differential Revision: https://phab.mercurial-scm.org/D12152
-
- Feb 03, 2022
-
-
Pierre-Yves David authored
When maintaining (light) fork, it is useful to be able to disable this. Differential Revision: https://phab.mercurial-scm.org/D12133
-
- Jan 20, 2022
-
-
Martin von Zweigbergk authored
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
-
- Jan 08, 2022
-
-
Martin von Zweigbergk authored
I want to remove knowledge of paths from the `simplemerge` core module. As part of that, let's move the default labels from the core module to the extension. Differential Revision: https://phab.mercurial-scm.org/D11977
-
- Dec 14, 2021
-
-
Martin von Zweigbergk authored
Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972
-
- Jan 04, 2022
-
-
Augie Fackler authored
-
- Jan 03, 2022
-
-
Raphaël Gomès authored
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
-
- Nov 22, 2021
-
-
Raphaël Gomès authored
This is the re-send of the backout in D11757 that I accidentally queued. I'll rewrite the original commit message: ...sigh We do not have Python 3 packaging for thg on Windows where the vast majority of of users use the thg installer for Mercurial. Until this is done (hopefully this cycle), we're keeping Python. (end of the old commit message) On top of this, we have a solid lead to have competent people take care of this packaging issue for us in time for the 6.1 release, which is really the main reason for us to wait. We're trying our best to make this work, so please bear with us. Differential Revision: https://phab.mercurial-scm.org/D11770
-
- Nov 24, 2021
-
-
Gregory Szorc authored
Python 3.10 is out and we should support it. This commit teaches the automation code to install and support building for Python 3.10. Differential Revision: https://phab.mercurial-scm.org/D11776
-
- Nov 16, 2021
-
-
Gregory Szorc authored
Let's keep the environment modern. Differential Revision: https://phab.mercurial-scm.org/D11775
-
- Nov 25, 2021
-
-
Matt Harbison authored
Differential Revision: https://phab.mercurial-scm.org/D11805
-
Matt Harbison authored
This is required for Python 3.10 support. Differential Revision: https://phab.mercurial-scm.org/D11804
-
Matt Harbison authored
Somewhere along the line, the formatting changed. There's no change in package content here- it's just some minor text changes. Py2 doesn't have any packages we'll be updating, so I'm not bothering there. Differential Revision: https://phab.mercurial-scm.org/D11803
-
- Nov 17, 2021
-
-
Mathias De Mare authored
This makes it possible to install multiple Mercurial rpms on the same machine in different locations. Differential Revision: https://phab.mercurial-scm.org/D11768
-
Mathias De Mare authored
Using uid 1000 and gid 1000 works by default in some cases, but 'id -u' and 'id -g' should work in all cases. Differential Revision: https://phab.mercurial-scm.org/D11767
-
- Nov 19, 2021
-
-
Raphaël Gomès authored
-
- Nov 16, 2021
-
-
Raphaël Gomès authored
We have Windows runners for now, and we're trying to find more, so let's share the joy of flaky tests with everyone. Differential Revision: https://phab.mercurial-scm.org/D11765
-
- Nov 10, 2021
-
-
Martin von Zweigbergk authored
We're dropping support for Python 2 after hg 6.0. Differential Revision: https://phab.mercurial-scm.org/D11748
-
- Oct 21, 2021
-
-
Raphaël Gomès authored
`HGTEST_TIMEOUT` is overridden by `HGTEST_SLOWTIMEOUT` for tests marked as slow, which `test-check-pytype.t` is. So this whole time the timeout was 1500s (or 25 minutes), which is unfortunately not long enough for a *lot* of the times it's run on the CI. Differential Revision: https://phab.mercurial-scm.org/D11717
-
- Oct 04, 2021
-
-
Matt Harbison authored
Not sure if this helps with recent certificate issues[1], but we might as well keep this modern. Note that certifi no longer claims py2 support, and there's a PR to add it back in[2]. Py2 support was dropped in 2020.04.05.2 (which predates what's being updated here). None of the *.py files have changed since the 2020.6.20 release, and I was able to call `certifi.where()` in both a virtualenv and with `hg debugshell` from an MSI install with this version, so we shouldn't be any worse off than before. [1] mercurial/tortoisehg/thg#5745 [2] https://github.com/certifi/python-certifi/pull/154 Differential Revision: https://phab.mercurial-scm.org/D11609
-
- Sep 28, 2021
-
-
Martin von Zweigbergk authored
Most callers of `scmutil.revrange()` pass in a revset provided by the user. If there are problems resolving that, it should result in an `InputError` and exit code 10 (when using detailed exit codes). However, there are also some callers that pass in revsets not provided by the user. `InputError` is not appropriate in those cases. This patch therefore introduces a wrapper around `scmutil.revrange()` that simply converts the exception type. I put it in `logcmdutil.py` since that seems to be the lowest-level module in the (poorly defined) UI layer. Differential Revision: https://phab.mercurial-scm.org/D11560
-
Raphaël Gomès authored
We have unfortunately ran out of free credit on the runners we were using from OVH for the Windows CI. We will be disabling the two remaining ones on the 30th of September, hence we need the CI to pass even if Windows jobs cannot start as a temporary measure. Hopefully we can find another way of getting Windows runners soon. Differential Revision: https://phab.mercurial-scm.org/D11499
-
Pierre-Yves David authored
The dirstate has a lot of code to compute a set of all "non-normal" and "from_other_parent" entries. This is all used in one, unique, location, when `setparent` is called and moved from a merge to a non merge. At that time, any "merge related" information has to be dropped. This is mostly useful for command like `graft` or `shelve` that move to a single-parent state -before- the commit. Otherwise the commit will already have removed all traces of the merge information in the dirstate (e.g. for a regular merges). The bookkeeping for these sets is quite invasive. And it seems simpler to just drop it and do the full computation in the single location where we actually use it (since we have to do the computation at least once anyway). This simplify the code a lot, and clarify why this kind of computation is needed. The possible drawback compared to the previous code are: - if the operation happens in a loop, we will end up doing it multiple time, - the C code to detect entry of interest have been dropped, for now. It will be re-introduced later, with a processing code directly in C for even faster operation. Differential Revision: https://phab.mercurial-scm.org/D11507
-
- Sep 17, 2021
-
-
Pierre-Yves David authored
The check-code script does not motivate the banning of $PWD so I am not sure what it is about. And I will needs to use the env variable in the next tests. So I am adding a way to make an exception. Differential Revision: https://phab.mercurial-scm.org/D11450
-
- Sep 01, 2021
-
-
Pierre-Yves David authored
The previous message was quite verbose and hard to understand. The new one should be friendlier. Differential Revision: https://phab.mercurial-scm.org/D11382
-
- Aug 24, 2021
-
-
Pierre-Yves David authored
eh ;-) Differential Revision: https://phab.mercurial-scm.org/D11350
-
Pierre-Yves David authored
The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11349
-
Pierre-Yves David authored
The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11348
-
Pierre-Yves David authored
The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11347
-
Pierre-Yves David authored
The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11346
-
Pierre-Yves David authored
The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11345
-
Pierre-Yves David authored
The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11344
-
Pierre-Yves David authored
The goal of this is to make sure we set the data right, so we need to make sure it run after the new method, that we actually call, in addition to the old one, that we no longer call. Differential Revision: https://phab.mercurial-scm.org/D11343
-