From 890080673baee9102d6b7157baaa529cd75b0577 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Mon, 6 Mar 2023 10:06:28 -0600 Subject: [PATCH] check-versions: remove hg-git stuff It's not worth it to keep trying to run this. Signed-off-by: Felipe Contreras --- tools/check-versions | 14 -------------- tools/hggit_rename_fix_0.8.0.patch | 22 ---------------------- tools/hggit_rename_fix_0.9.0.patch | 22 ---------------------- 3 files changed, 58 deletions(-) delete mode 100644 tools/hggit_rename_fix_0.8.0.patch delete mode 100644 tools/hggit_rename_fix_0.9.0.patch diff --git a/tools/check-versions b/tools/check-versions index 38e0d8b..b57fa54 100755 --- a/tools/check-versions +++ b/tools/check-versions @@ -220,20 +220,6 @@ end add_component(:hg, 'https://www.mercurial-scm.org/repo/hg', checkout_fix: hg_checkout_fix) -hggit_checkout_fix = lambda do |version| - return unless check_version(version, '0.8.0') - - if check_version(version, '0.9.0') - run_cmd %W[hg import -q --no-commit #{__dir__}/hggit_rename_fix_0.9.0.patch], fatal: false - else - run_cmd %W[hg import -q --no-commit #{__dir__}/hggit_rename_fix_0.8.0.patch], fatal: false - end -end - -add_component(:hggit, 'https://foss.heptapod.net/mercurial/hg-git', checkout_fix: hggit_checkout_fix) - -add_component(:dulwich, 'https://github.com/dulwich/dulwich.git', version_format: 'dulwich-%s', kind: :git) - def load_checks(file) file.each do |e| e.chomp! diff --git a/tools/hggit_rename_fix_0.8.0.patch b/tools/hggit_rename_fix_0.8.0.patch deleted file mode 100644 index 71ca694..0000000 --- a/tools/hggit_rename_fix_0.8.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/hggit/git_handler.py b/hggit/git_handler.py ---- a/hggit/git_handler.py -+++ b/hggit/git_handler.py -@@ -693,6 +693,8 @@ - def import_git_commit(self, commit): - self.ui.debug(_("importing: %s\n") % commit.id) - -+ extra_in_message = self.ui.configbool('git', 'debugextrainmessage', False) -+ - detect_renames = False - (strip_message, hg_renames, - hg_branch, extra) = git2hg.extract_hg_metadata( -@@ -703,7 +705,8 @@ - # renames detected from Git. This is because we export an extra - # 'HG:rename-source' Git parameter when this isn't set, which will - # break bidirectionality. -- extra['hg-git-rename-source'] = 'git' -+ if not extra_in_message: -+ extra['hg-git-rename-source'] = 'git' - else: - renames = hg_renames - diff --git a/tools/hggit_rename_fix_0.9.0.patch b/tools/hggit_rename_fix_0.9.0.patch deleted file mode 100644 index fd4a206..0000000 --- a/tools/hggit_rename_fix_0.9.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/hggit/git_handler.py b/hggit/git_handler.py ---- a/hggit/git_handler.py -+++ b/hggit/git_handler.py -@@ -829,6 +829,8 @@ - def import_git_commit(self, commit): - self.ui.debug(_(b"importing: %s\n") % commit.id) - -+ extra_in_message = self.ui.configbool(b'git', b'debugextrainmessage', False) -+ - detect_renames = False - (strip_message, hg_renames, - hg_branch, extra) = git2hg.extract_hg_metadata( -@@ -839,7 +841,8 @@ - # renames detected from Git. This is because we export an extra - # 'HG:rename-source' Git parameter when this isn't set, which will - # break bidirectionality. -- extra[b'hg-git-rename-source'] = b'git' -+ if not extra_in_message: -+ extra[b'hg-git-rename-source'] = b'git' - else: - renames = hg_renames -