From f00911668a023181f18a429956d865807f962da1 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 8 Mar 2025 02:01:54 -0600
Subject: [PATCH 1/4] Avoid decoding some binary stuff

---
 git-remote-hg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/git-remote-hg b/git-remote-hg
index 465f1af..8f05536 100755
--- a/git-remote-hg
+++ b/git-remote-hg
@@ -507,11 +507,11 @@ def export_ref(repo, name, kind, head):
                 extra_msg += (b"rename : %s => %s\n" % e).decode()
 
             for key, value in extra.items():
-                key, value = key.decode(), value.decode()
-                if key in ('author', 'committer', 'encoding', 'message', 'branch', 'hg-git'):
+                key = key.decode()
+                if key in ('author', 'committer', 'encoding', 'message', 'branch', 'hg-git', 'transplant_source'):
                     continue
                 else:
-                    extra_msg += "extra : %s : %s\n" % (key, urlquote(value))
+                    extra_msg += "extra : %s : %s\n" % (key, urlquote(value.decode()))
 
             if extra_msg:
                 desc += b'\n--HG--\n' + extra_msg.encode()

From d2a3a646afdad0203e0f7e6164e4851eddcb5e08 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 8 Mar 2025 08:30:24 -0600
Subject: [PATCH 2/4] test: unset user some config

---
 test/test-lib.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 61ffa8b..7a4a4f7 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -15,6 +15,8 @@ GIT_COMMITTER_NAME='C O Mitter'
 export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
 export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
 
+unset XDG_CONFIG_HOME
+
 if [[ $(uname -s) = MSYS* ]]; then
 	test_set_prereq WIN
 	export TEST_CMP='diff --strip-trailing-cr -u'

From c861db6add8485148f4e4ecca5fb917994c9c425 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 8 Mar 2025 08:32:03 -0600
Subject: [PATCH 3/4] check-versions: add newer versions

---
 tools/versions.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/versions.txt b/tools/versions.txt
index 379a81b..d8d86b7 100644
--- a/tools/versions.txt
+++ b/tools/versions.txt
@@ -23,3 +23,8 @@
 6.2
 6.3
 6.4
+6.5
+6.6
+6.7
+6.8
+6.9

From 408333afca931970d19c57bb697cdf83f6abcbef Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 8 Mar 2025 08:48:47 -0600
Subject: [PATCH 4/4] github: use newer hg versions

---
 .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 6586f84..04b08ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        hg: [ '5.5', '5.6', '5.7', '5.8', '5.9', '6.0', '6.1', '6.2', '6.3', '6.4' ]
+        hg: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7', '6.8', '6.9' ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4