Merge tag 'v0.5' into felipec

These changes can be merged with limited to no conflict resolution.

tools/check-versions

@@ -209,6 +209,10 @@ def add_component(id, url, **args)
 end
 
 hg_checkout_fix = lambda do |version|
+  if check_version(version, '5.7')
+    run_cmd %W[hg import -q --no-commit #{__dir__}/hg_revert_5.7.patch]
+  end
+
   FileUtils.cp('hg', "#{$builddir}/bin/")
 
   return if check_version(version, '4.3')
@@ -225,10 +229,14 @@ add_component(:hg, 'https://www.mercurial-scm.org/repo/hg', checkout_fix: hg_che
 hggit_checkout_fix = lambda do |version|
   return unless check_version(version, '0.8.0')
 
-  run_cmd %W[hg import -q --no-commit #{__dir__}/hggit_rename_fix_0.8.0.patch], fatal: false
+  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://bitbucket.org/durin42/hg-git', checkout_fix: hggit_checkout_fix)
+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)
 
@@ -280,7 +288,7 @@ elsif not $versions.empty?
   # mode 2
   $verbosity = HIGH
 
-  exit check(versions) ? 0 : 1
+  exit check($versions) ? 0 : 1
 else
   # mode 3
   $verbosity = QUIET

tools/hg_revert_5.7.patch

@@ -0,0 +1,24 @@
+diff --git a/hg b/hg
+index 4ec2b6140b..a3e61ad39c 100755
+--- a/hg
++++ b/hg
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/env python
+ #
+ # mercurial - scalable distributed SCM
+ #
+diff --git a/mercurial/hg.py b/mercurial/hg.py
+index 1a7a281e30..bf75f15ac1 100644
+--- a/mercurial/hg.py
++++ b/mercurial/hg.py
+@@ -1013,7 +1013,7 @@ def clone(
+                                 pass
+                 if uprev is None:
+                     try:
+-                        if destrepo._activebookmark:
++                        if False:
+                             uprev = destrepo.lookup(destrepo._activebookmark)
+                             update = destrepo._activebookmark
+                         else:
+

tools/hggit_rename_fix_0.9.0.patch

@@ -0,0 +1,22 @@
+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
+ 

tools/versions.txt

@@ -26,8 +26,17 @@ hg:4.3 hggit:0.8.10 dulwich:0.18.0 # 2017_11
 hg:4.4 hggit:0.8.10 dulwich:0.18.0 # 2017_11
 
 hg:4.5 hggit:0.8.11 dulwich:0.18.0 # 2018_02
-hg:4.6 hggit:0.8.12 dulwich:0.19.7 # 2018_10
-hg:4.7 hggit:0.8.12 dulwich:0.19.7 # 2018_10
-hg:4.8 hggit:@ dulwich:0.19.11
-hg:4.9 hggit:@ dulwich:0.19.11
-hg:5.0 hggit:@ dulwich:0.19.11
+hg:4.6 hggit:0.8.13 dulwich:0.19.7 # 2018_10
+hg:4.7 hggit:0.8.13 dulwich:0.19.7 # 2018_10
+hg:4.8 hggit:0.8.13 dulwich:0.19.7 # 2018_10
+hg:4.9 hggit:0.8.13 dulwich:0.19.7 # 2019_01
+hg:5.0 hggit:0.8.13 dulwich:0.19.7 # 2019_04
+hg:5.1 hggit:0.8.13 dulwich:0.19.7 # 2019_07
+hg:5.2 hggit:0.8.13 dulwich:0.19.7 # 2019_11
+
+hg:5.3 hggit:0.9.0 dulwich:0.19.15 # 2020_01
+hg:5.4 hggit:0.9.0 dulwich:0.19.15 # 2020_04
+hg:5.5 hggit:0.9.0 dulwich:0.19.15 # 2020_08
+hg:5.6 hggit:0.9.0 dulwich:0.19.15 # 2020_10
+
+hg:5.7 hggit:0.10.0 dulwich:0.19.16 # 2021_01