Nemcio/git-remote-hg
1
0
Fork 0
mirror of https://github.com/mnauw/git-remote-hg.git synced 2026-01-28 09:09:02 +01:00
Code Issues Packages Projects Releases Activity
535 Commits 4 Branches 13 Tags
6d75435eabbe56ed514b57f911eccd9de4f0bae9
Commit Graph

109 Commits

Author SHA1 Message Date
Mark Nauwelaerts
b5f104364f test: ensure original behaviour in hg-git test 2025-05-03 12:18:25 +02:00
Mark Nauwelaerts
a48d4fd7fb test: post-merge align of main-push test 2025-05-03 12:18:25 +02:00
Mark Nauwelaerts
301552278a test: post-merge align of helper test 2025-05-02 16:13:19 +02:00
Mark Nauwelaerts
c329c9690a Merge commit '408333afca931970d19c57bb697cdf83f6abcbef' into felipec 
These changes can be merged with limited conflict resolution.
 2025-05-01 20:00:37 +02:00
Mark Nauwelaerts
8acf139e44 Merge commit 'b8b9a2f571c322bb3fe8a19c102a0f75fe9f3a9a' into felipec 
These changes can be merged with limited to no conflict resolution.
 2025-04-30 20:31:41 +02:00
Mark Nauwelaerts
2529c986c2 Merge commit 'd51f508916d543f987868dd6f7072c72e8f692b2' into felipec 
These changes can be merged with limited to no conflict resolution.
 2025-04-30 18:30:58 +02:00
Mark Nauwelaerts
ab398ade1d Merge commit '7196dac02d94105586305462be5c15a812c6f7de' into felipec 
These changes can be mostly accepted and merged with limited resolution,
especially since hg-git testing is mostly disabled and discarded in
future commits.
 2025-04-29 21:56:56 +02:00
Mark Nauwelaerts
e1d25cf97c Merge commit 'b4c3277f72f995cc0babcdc5bc6f6d0e2254acc3' into felipec 
These changes can be merged with limited conflict resolution.
 2025-04-29 21:18:04 +02:00
Mark Nauwelaerts
498c615051 Merge commit '22229dd738ae3d0752b293cca1cf948c1d154cfa' into felipec 
These changes can be merged with limited to no conflict resolution.
 2025-04-29 20:48:13 +02:00
Felipe Contreras
d2a3a646af test: unset user some config 2025-03-08 08:30:24 -06:00
Felipe Contreras
63cf2780ba test: fixes for Windows 
It's not clear if these tests can't work, or don't work at the moment,
but at least some seem to be the fault of hg, not us.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-07 18:45:17 -06:00
Felipe Contreras
5e6ef0a1d5 test: properly check for mercurial 
We want to fail if it's not present, not skip the tests.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:40:44 -06:00
Felipe Contreras
a1e2c4acc9 test: remove pointless prereq checks 
The prereq check was necessary in upstream git, not here where it's a
noop.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:40:44 -06:00
Felipe Contreras
a8bb2a28a3 test: enable hg-git tests 
They have been working for a long time but the standard packages needed
to be patched with check-versions to run them successfully.

Now that the expected output is stored we don't need to patch anything
and they can just be run.

This reverts commit b022367aef.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:18:53 -06:00
Felipe Contreras
ffcb41cc52 test: hg-git: trivial cleanup 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:18:53 -06:00
Felipe Contreras
9949745533 test: hg-git: general cleanup 
Now that we don't have to run hg-git the code is much simpler.

No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:18:52 -06:00
Felipe Contreras
83620648ab test: hg-git: fetch output from expected dir 
So we don't actually have to run hg-git every time (it's broken most of
the time anyway).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:09:02 -06:00
Felipe Contreras
30a2d61bdf test: add expected output 
Generated with: hg:6.3 hggit:1.0.1 dulwich:0.20.50

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:09:02 -06:00
Felipe Contreras
2fdb786fc4 test: hg-git: add test_cmp_expected helper 
No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:09:02 -06:00
Felipe Contreras
79797918ff test: hg-git: add helper functions 
It's tedious to do almost exactly the same thing over and over.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:09:02 -06:00
Felipe Contreras
d45d5cde50 test: switch to bash 
We are using some bash-specific tricks.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:09:02 -06:00
Felipe Contreras
7078666c77 test: hg-git: add main helper 
Simplifies current code and will be useful later.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 09:55:03 -06:00
Felipe Contreras
08e453f8db test: hg-git: simplify hg log filter 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 09:55:03 -06:00
Felipe Contreras
ec7119d0ef test: relax hg-git checks 
We don't care about the revision number of the commits, only the
topology.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 09:55:03 -06:00
Felipe Contreras
6ae5e3961e test: hg-git: cleanup 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 09:55:03 -06:00
Felipe Contreras
de9bf35388 test: include sharness properly 
So that it can be overridden.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-05 22:40:09 -06:00
Felipe Contreras
857d68708b test: trivial cleanups 
TEST_DIRECTORY doesn't even exist in sharness.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-05 22:32:27 -06:00
Felipe Contreras
22229dd738 Only report success after successful push 
Otherwise git core will update the namespaced refs, and show success to
the user, even in the case of a crash.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-01 11:38:29 -06:00
Mark Nauwelaerts
5f34d049b9 test: adjust configuration to recent git 
... to allow file protocol

Fixes mnauw/git-remote-hg#53
 2022-12-06 22:57:29 +01:00
Felipe Contreras
b3b9b5de39 Enable python3 support 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2022-08-08 00:01:41 -05:00
Felipe Contreras
6d6504d1fd test: fix for latest versions of git 
Since git 2.34 the big push with force test is broken thanks to:

726a228dfb (fast-export: fix surprising behavior with --first-parent, 2021-12-16)

Since this only affects pushing multiple heads to the same branch, it
probably is not that important.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2022-07-30 00:38:40 -05:00
Paul Wise
a08ad9d2b4 Add an option to test the pre-installed scripts 
This is useful for distros like Debian that do tests on installed packages.

See-also: https://ci.debian.net/
 2022-02-22 21:58:51 +01:00
Mark Nauwelaerts
949345fb11 test: drop check on default 
... since default branch is updated semi-random (implementation defined) from
the last non-branch push.

Fixes mnauw/git-remote-hg#48
 2022-02-20 15:38:54 +01:00
Mark Nauwelaerts
0d49f75131 test: additional basic configuration 2022-02-20 15:38:54 +01:00
Paul Wise
f5c38f3a59 Run Python scripts under the chosen version 
The Python scripts have unversioned Python shebangs so tests will
fail if the chosen Python version is not unversioned Python.

Copy the scripts to tmp dirs and change the shebang to the chosen Python.

Also prevent sharness from adding the unversioned Python scripts to PATH.
 2021-04-05 13:27:00 +02:00
Paul Wise
3b11156e69 Detect which Python version is available and run tests using it 
Allow overriding the Python version.

Use importing the mercurial module as the test rather than just python,
and merge the python and mercurial module skipping into one test for both
since the mercurial module has to work under the chosen python version.
 2021-04-05 13:27:00 +02:00
Paul Wise
e596a5f457 Add missing line ending at EOF 2021-04-05 13:25:36 +02:00
Paul Wise
ec654d4682 Be more flexible about the path to sharness 
Some folks might want to run a different version.

Check all the common installation paths and
support using a custom path to sharness.
 2021-04-03 10:29:48 +02:00
Paul Wise
5769e965eb Expect success for the main pull tags test 
The git bug that caused the switch to unstable has been fixed.

This reverts commit a5dfc9025b.
 2021-04-03 10:01:35 +02:00
Paul Wise
1ee28bd233 Use a compatible umask for the executable bit preservation test 
More restrictive umasks like 027 will cause the test to fail.

Ubuntu 21.04 will change the default umask to 027.
 2021-04-03 10:00:58 +02:00
Mark Nauwelaerts
28ed63b707 test: use generic python reference rather than python2 2020-06-12 14:00:17 +02:00
Mark Nauwelaerts
46178f546a test: use a legacy mode for hg-git test 2020-06-12 13:42:19 +02:00
Mark Nauwelaerts
be2445963b test: align order of options to stable ArgumentParser expectation 2020-06-12 13:20:25 +02:00
Mark Nauwelaerts
8b4bfe7e87 test: drop check on master in push mode 
... since master is picked semi-random (implementation defined) in case
of multiple default branch tips

This mainly affects push mode since a preceding command succeeds
partially (and therefore affect the random), whereas the preceding fails
completely in non-push mode.
 2020-06-12 13:20:25 +02:00
Mark Nauwelaerts
b516aa9326 Merge commit 'b3cd' into felipec 
These changes can be merged with limited to none conflict resolution.
 2020-06-01 12:57:26 +02:00
Mark Nauwelaerts
b60eb47173 Merge commit 'fad59f' into felipec 
These changes can be merged with limited to none conflict resolution.
 2020-06-01 12:52:41 +02:00
Mark Nauwelaerts
7ae03f7640 Merge commit '5cc27' into felipec 
These changes can be merged with limited to none conflict resolution.
 2020-06-01 11:38:52 +02:00
Mark Nauwelaerts
95da53badd test: adjust push force to push mode behavior 2020-06-01 11:12:50 +02:00
Mark Nauwelaerts
d1544e2ccd test: pushing a bookmark without changesets 
This works in recent versions of Mercurial.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2019-06-19 09:58:21 -05:00
Felipe Contreras
153a216f47 test: main: cleanup big push fetch first 
In order to use setup_big_push().

No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2019-06-18 19:24:19 -05:00