- Aug 13, 2020
-
-
Tristan Seligmann authored
Pass --ff-only to git pull to avoid a warning.
-
- Oct 11, 2020
-
-
Dan Villiom Podlaski Christiansen authored
Copied from changeset 5a19d7c9129b in the stable branch, latest as of 2020-10-11. https://www.mercurial-scm.org/repo/hg/rev/5a19d7c9129b
-
- Aug 13, 2020
-
-
Tristan Seligmann authored
Pass explicit messages to git merge to avoid relying on the default.
-
- Aug 06, 2020
-
-
muxator authored
If the user modified his log template to include gitnode(), an invocation of hg incoming causes a crash with the following message: AttributeError: 'overlayrepo' object has no attribute 'githandler'
-
- Jun 12, 2020
-
-
Manuel Jacob authored
This makes this file identical with upstream hg@07b79569fdf8 (last revision from which we copied this file).
-
Manuel Jacob authored
-
Manuel Jacob authored
-
- May 10, 2020
-
-
Manuel Jacob authored
(folded with intermediate revision with new message by Georges Racinet) The previous conditional was wrong: in current Mercurial, 'co' is in principle not an integer. The condition on integer has been introduced for the port to py3, but does not change the fact that changelog.__contains__ is for integers. The original intent in a90fe3e8a8c3 was probably to exclude local repositories, but this had the side effect of setting `co=None` in all cases, hence affecting pulls having nothing to do with hg-git, as the new test demontstrates. What we really want is to force `co=None` only for remote Git repositories, for the reasons explained in the comment. Previous intermediate commit was cleanup: eliminate if statement with condition that is always true 'co' is never an integer. It’s always None or of type bytes. Apparently 'co' was of type int some years ago. A proper fix would require to fix the lookup() remote command or change hg to not require it e.g. when pulling with -r. For now, let’s remove the broken code and be honest about that we give up.
-
- Dec 23, 2019
-
-
Georges Racinet authored
This is ugly indeed, but a true cleaning would be to convert to a sensible testing system.
-
- Mar 06, 2020
-
-
Manuel Jacob authored
-
- May 04, 2020
-
-
Manuel Jacob authored
-
- May 03, 2020
-
-
Manuel Jacob authored
These files were byteified using hg’s contrib/byteify-strings.py: - contrib/hggitperf.py - hggit/compat.py - hggit/git2hg.py - hggit/gitdirstate.py - hggit/gitrepo.py - hggit/git_handler.py - hggit/hg2git.py - hggit/hgrepo.py - hggit/overlay.py - hggit/util.py - hggit/verify.py - hggit/_ssh.py - hggit/__init__.py - tests/commitextra.py Additionally, "--treat-as-kwargs opts kwargs" were passed as arguments. Some of the changes will be undone later. Because of the large amount of literals that should be changed in comparison to the few literals that should stay, it seemed better to do it this way around. Raw literals are not changed by the script. Some of them will be changed manually in a separate changeset.
-
Manuel Jacob authored
-
- Dec 23, 2019
-
-
Georges Racinet authored
-
- Mar 05, 2020
-
-
Manuel Jacob authored
* run `find . -name "*.py" -print0 -o -path ./tests/hghave | xargs -I {} -0 2to3 --fix=print --write {}` * run `find . -name "*.py" -print0 -o -path ./tests/hghave | xargs -I {} -0 2to3 --doctests_only --fix=print --write {}` * remove extra newline at end of files introduced by last command * add `from __future__ import print_function` to Python files
-
- Nov 22, 2019
-
-
timeless developer authored
-
- Mar 05, 2020
-
-
Manuel Jacob authored
After copying the files, a6ddd3f835af was reapplied.
-
- Dec 22, 2019
-
-
Georges Racinet authored
Git behaviour and output has changed, in a way that seems hard to reconcile with glob or regex patterns. we'll probably have to write an entire variant of this test. In the meanwhile, this skipping should restore the main CI runs.
-
Georges Racinet authored
This is to run some tests only if the Git version is smaller than the given one.
-
- Aug 01, 2019
-
-
Pierre-Yves David authored
The message case got fixed in 5.0. So we need to match both version.
-
- Feb 23, 2019
-
-
Kevin Bullock authored
-
Kevin Bullock authored
-
- Dec 02, 2018
-
-
Kevin Bullock authored
-
- Nov 29, 2017
-
-
Sean Farley authored
This is a large patch since we're copying over Mercurial's helpers-testrepo.sh and a slightly modified version of pyflakes.t
-
- Feb 07, 2018
-
-
Tony Tung authored
-
- Feb 21, 2018
-
-
Sean Farley authored
This will be used in the following patch.
-
- Feb 07, 2018
-
-
Tony Tung authored
-
- Feb 06, 2018
-
-
Kevin Bullock authored
-
- Nov 30, 2017
-
-
Sean Farley authored
-
Sean Farley authored
It seems fffe8883960b incorrectly did a match on the second parent (which is null) and that core Mercurial mistakenly matched the whole line with (re). This was recently fixed in 6d5718e39657 in core, so let's update the test with the correct match.
-
- Dec 02, 2017
-
-
Sean Farley authored
-
- Sep 05, 2016
-
-
Dan Villiom Podlaski Christiansen authored
Sharing repository data, but not Git metadata can lead to confusing scenarios, particularly in the face of history editing and/or forced updates. This adds a test for the share integration added in 1003994dd497.
-
- Nov 24, 2017
-
-
Pierre-Yves David authored
The tests were failing on some minor output changes. It looks like this is output change on the git side. We match the two variants in the tests.
-
- Nov 20, 2017
-
-
Pierre-Yves David authored
Git subrepository are disabled by default in in 4.4.1. We re-enabled them for the tests to prevent multiple failures.
-
- May 15, 2015
-
-
Sean Farley authored
To help improve the speed Mercurial operations, we shouldn't leave the whole repository in the draft phase. The only hueristic git has for 'public' is remote HEAD. Therefore, if remote HEAD exists then we use it to mark the corresponding local commit as public. For now, we'll put this behind a config flag for easier rollback.
-
- Nov 02, 2017
-
-
Kevin Bullock authored
Since updating run-tests.py in e085b381e8e2, a default date of '0 0' is no longer set automatically. Restore this by adding it to our own test suite's default hgrc.
-
- Oct 24, 2017
-
-
Kevin Bullock authored
-
Kevin Bullock authored
-
Kevin Bullock authored
Before this change, setting git.similarity to a value out of range would result in a traceback because 'util' is hg-git's own module. Adds a test demonstrating the fixed behavior.
-
- Oct 23, 2017
-
-
Kevin Bullock authored
-