From ae21cbf1a2a70bcf3d28b40fd9c690975e070594 Mon Sep 17 00:00:00 2001 From: Frej Drejhammar Date: Thu, 5 Jun 2025 16:46:59 +0200 Subject: [PATCH 1/2] CI: Bump Ubuntu version used for the CI Switch to the oldest supported version. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf02150..bb70d30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: test-earliest: name: Run test suite on the earliest supported Python version - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 From f71385ec144e2da2d7e87266669b7d338fa39dbd Mon Sep 17 00:00:00 2001 From: Frej Drejhammar Date: Thu, 5 Jun 2025 16:35:08 +0200 Subject: [PATCH 2/2] Fix "Warn if one of the marks, mapping, or heads files are empty" The commit "Warn if one of the marks, mapping, or heads files are empty" (7224e420a75f) mixed up the state and heads caches and reported that the heads cache was empty if the state case was. Error found by Shun-ichi Goto. Closes #338 --- hg-fast-export.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hg-fast-export.py b/hg-fast-export.py index b67110b..f00943c 100755 --- a/hg-fast-export.py +++ b/hg-fast-export.py @@ -539,7 +539,7 @@ def hg2git(repourl,m,marksfile,mappingfile,headsfile,tipfile, if len(state_cache) != 0: for (name, data) in [(marksfile, old_marks), (mappingfile, mapping_cache), - (headsfile, state_cache)]: + (headsfile, heads_cache)]: check_cache(name, data) ui,repo=setup_repo(repourl)