Nemcio/git-remote-hg
1
0
Fork 0
mirror of https://github.com/mnauw/git-remote-hg.git synced 2025-11-03 18:15:49 +01:00
Code Issues Packages Projects Releases Activity
501 Commits 4 Branches 13 Tags
aa1d0bc1527a2d55a7e204b47e599de40e6ce257
Commit Graph

501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nauwelaerts
aa1d0bc152 Merge commit '7908c70efbd0420e21c2b0b7841b61e3b933be51' into felipec 
These changes can be merged with limited conflict resolution.
 2025-05-01 16:02:47 +02:00
Mark Nauwelaerts
bdbe62256a Merge commit '8025945a62d16ef078299ad5903081f250d762ed' into felipec 
These changes can be merged with some adjustments.
That is, only conditionally prefer some newer API, but otherwise
prefer current code paths, which have been tried and tested for a
long time through various version (both python and hg).
 2025-04-30 20:55:24 +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
1df692295c Merge commit 'f032d3617bb47585f20006abee83d7309498c17d' into felipec 
This change is part of port to python v3 and can as such be discarded.
 2025-04-30 20:18:32 +02:00
Mark Nauwelaerts
027e1a16f0 Merge commit '60a1d7ae7a60988f122d8d9ba9ad3c693c5141ae' into felipec 
These changes can be merged with limited conflict resolution.
 2025-04-30 19:16:33 +02:00
Mark Nauwelaerts
723e6c76fc Merge commit '9b54c626bcf25d390861b430145e96af3ec8459c' into felipec 
The removal of support for older version can reduce clutter and ease
maintenance, but in this case such gains are marginal, and there would
then only be loss (of older functionality).

As such, this change is discarded, and older version support is kept.
 2025-04-30 18:34:29 +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
0fe1e359ec Merge commit '7394fc890e76ec3919fa30048338a9cbb59ce899' into felipec 
This commit can be discarded as it is not relevant; revwalk() is used
in stead of gitrange().  The latter is based on recorded tips, which
are also no longer in use, as that approach is not quite robust.
It is also inefficient when fetching large number of new bookmarks
(for which there can be no pre-tracked tip).
 2025-04-29 20:53:25 +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
Mark Nauwelaerts
6b6aa9deaa Merge tag 'v0.6' into felipec 
These changes involve a port to python3.  These can mostly be discarded,
as such port has already been done in an alternative way, which supports
both v2 and v3.
 2025-04-28 18:53:34 +02:00
Mark Nauwelaerts
2685f56c7c Merge tag 'v0.5' into felipec 
These changes can be merged with limited to no conflict resolution.
 2025-04-28 18:37:33 +02:00
Mark Nauwelaerts
3314ce3dda Makefile: use lighter asciidoctor iso asciidoc 2025-04-28 17:24:22 +02:00
Mark Nauwelaerts
e4d87d5e2c Use raw literals for some regexps 
Fixes mnauw/git-remote-hg#57
 2025-02-08 21:19:29 +01:00
Mark Nauwelaerts
b029ac0500 Improve hg-git compatibility mode 
... by adjusting to some hg-git changes

See mnauw/git-remote-hg#55
 2023-05-07 13:21:45 +02:00
Felipe Contreras
7908c70efb Trivial simplifications 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-20 02:09:17 -06:00
Felipe Contreras
7cff2c6adb Simplify export_file args 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-20 02:07:45 -06:00
Felipe Contreras
9c5b8835f4 Get rid of export_files 
It's not necessary.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-20 02:02:11 -06:00
Felipe Contreras
537e5a4735 Reorganize export_files 
No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-20 01:58:42 -06:00
Felipe Contreras
8025945a62 Simpler get_filechanges algorithm 
The status method achieves the same thing as the current code.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-20 01:54:10 -06:00
Felipe Contreras
33dccdfab0 Simplify get_filechanges 
No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-20 01:47:48 -06:00
Felipe Contreras
4ad9c8d70c Reorganize get_filechanges 
So it's more extensible.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-20 01:44:31 -06:00
Felipe Contreras
740c681c1d Trivial style change 
More idiomatic.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-20 01:39:33 -06:00
Felipe Contreras
995179444c Trivial simplification 
When there's no parents the files are the same as the manifest.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-20 01:37:49 -06:00
Felipe Contreras
e6c479c136 Cleanup timezone stuff 
No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-14 04:10:54 -06:00
Felipe Contreras
b8b9a2f571 Use relative option to hg.share 
When available.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-07 22:48:07 -06:00
Felipe Contreras
4c50223dba remote-hg: remove shared repo upgrade 
We are not in 2013 anymore.

This reverts commit 8f9a87c (remote-hg: add shared repo upgrade,
2013-08-09).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-07 22:47:53 -06:00
Felipe Contreras
35d32d5a75 Remove ancient marks upgrade path 
It's safe to safe everyone already moved on since 2013.

This reverts d379f37 (remote-hg: upgrade version 1 marks, 2013-05-24).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-07 21:49:05 -06:00
Felipe Contreras
7f6a843f0d github: add windows job 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-07 18:46:30 -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
f032d3617b Improve output writing 
Let's avoid all python weirdness and just write directly.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-07 11:52:05 -06:00
Mark Nauwelaerts
60a1d7ae7a Fix for paths in Windows 
Rewritten-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-07 11:52:05 -06:00
Felipe Contreras
10aec96d88 Simplify absolute path fix 
This actually works on Windows.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-07 11:33:30 -06:00
Felipe Contreras
9b54c626bc Remove support for hg < 4.0 
2016 is ancient anyway.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:40:44 -06:00
Felipe Contreras
d51f508916 check-versions: trivial results cleanup 2023-03-06 15:40:44 -06:00
Felipe Contreras
9916fead46 github: trivial update 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:40:44 -06:00
Felipe Contreras
09c4726083 check-versions: simplify for a single component 
No need for all the extra complexity just for hg.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:40:44 -06:00
Felipe Contreras
bb663c032f github: use standard hg packages 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:40:44 -06:00
Felipe Contreras
b590aec106 check-versions: remove code for other tools 
Only support hg.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:40:44 -06:00
Felipe Contreras
4496af4a5c check-versions: remove hg hack 
It was only needed for hg-git tests.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:40:44 -06:00
Felipe Contreras
890080673b check-versions: remove hg-git stuff 
It's not worth it to keep trying to run this.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2023-03-06 15:40:44 -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
7196dac02d Merge branch 'hg-git-revamp' 
* hg-git-revamp:
  test: enable hg-git tests
  test: hg-git: trivial cleanup
  test: hg-git: general cleanup
  test: hg-git: fetch output from expected dir
  test: add expected output
  test: hg-git: add test_cmp_expected helper
  test: hg-git: add helper functions
  test: switch to bash
  test: hg-git: add main helper
  test: hg-git: simplify hg log filter
  test: relax hg-git checks
  test: hg-git: cleanup
 2023-03-06 15:39:23 -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