From be82cff625c919e332da0879e2be0002485f1d1c Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 5 Oct 2022 07:25:49 +0000
Subject: [PATCH] 8294748: Cleanup unneeded references to hg

Reviewed-by: erikj, clanger
---
 make/RunTests.gmk             | 8 +++-----
 make/RunTestsPrebuiltSpec.gmk | 1 -
 make/SourceRevision.gmk       | 8 ++------
 make/autoconf/basic.m4        | 2 +-
 make/autoconf/basic_tools.m4  | 1 -
 make/autoconf/spec.gmk.in     | 1 -
 make/common/MakeBase.gmk      | 5 ++---
 7 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index c9ee216a722..117e4497014 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -1185,13 +1185,11 @@ ifeq ($(TEST_OPTS_JCOV), true)
     JCOV_SOURCE_DIFF := $(JCOV_OUTPUT_DIR)/source_diff
     JCOV_DIFF_COVERAGE_REPORT := $(JCOV_OUTPUT_DIR)/diff_coverage_report
 
-    ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
-      DIFF_COMMAND := $(HG) -R $(TOPDIR) diff -r $(TEST_OPTS_JCOV_DIFF_CHANGESET) > $(JCOV_SOURCE_DIFF)
-    else ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
+    ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
       DIFF_COMMAND := $(GIT) -C $(TOPDIR) diff $(TEST_OPTS_JCOV_DIFF_CHANGESET) > $(JCOV_SOURCE_DIFF)
     else
-      $(info Error: Must be either hg or git source tree for diff coverage.)
-      $(error Neither hg nor git source tree.)
+      $(info Error: Must be a git source tree for diff coverage.)
+      $(error No git source tree.)
     endif
 
     jcov-gen-diffcoverage: jcov-stop-grabber
diff --git a/make/RunTestsPrebuiltSpec.gmk b/make/RunTestsPrebuiltSpec.gmk
index f423fea7198..585fd24fda3 100644
--- a/make/RunTestsPrebuiltSpec.gmk
+++ b/make/RunTestsPrebuiltSpec.gmk
@@ -169,7 +169,6 @@ ZIPEXE := zip
 UNZIP := unzip
 EXPR := expr
 FILE := file
-HG := hg
 ULIMIT := ulimit
 
 ifeq ($(OPENJDK_BUILD_OS), windows)
diff --git a/make/SourceRevision.gmk b/make/SourceRevision.gmk
index 400b267530a..9a47ae456e2 100644
--- a/make/SourceRevision.gmk
+++ b/make/SourceRevision.gmk
@@ -42,11 +42,7 @@ $(eval $(call IncludeCustomExtension, SourceRevision-pre.gmk))
 STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev
 
 USE_SCM := false
-ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
-  USE_SCM := true
-  SCM_DIR := .hg
-  ID_COMMAND := $(PRINTF) "hg:%s" "$$($(HG) id -i)"
-else ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
+ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
   USE_SCM := true
   SCM_DIR := .git
   ID_COMMAND := $(PRINTF) "git:%s%s\n" \
@@ -85,7 +81,7 @@ ifeq ($(USE_SCM), true)
     REPO_REVISIONS += $$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME)
   endef
 
-  # Setup rules for all repos. This makes sure all the "hg id" calls are made
+  # Setup rules for all repos. This makes sure all the "git log" calls are made
   # in parallel.
   $(foreach repo, $(call FindAllReposRel), \
     $(eval $(call SetupGetRevisionForRepo, $(repo))) \
diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index 81f4d6eec1d..ff076ca7689 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -453,7 +453,7 @@ AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
     # in the source tree when configure runs
     file_to_test="$TOPDIR/Makefile"
     if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
-      AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
+      AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with non cygwin tools in a directory not created in cygwin.])
     fi
   fi
 ])
diff --git a/make/autoconf/basic_tools.m4 b/make/autoconf/basic_tools.m4
index 31499a3784c..fc349a811e3 100644
--- a/make/autoconf/basic_tools.m4
+++ b/make/autoconf/basic_tools.m4
@@ -342,7 +342,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
 
   UTIL_LOOKUP_PROGS(READELF, greadelf readelf)
   UTIL_LOOKUP_PROGS(DOT, dot)
-  UTIL_LOOKUP_PROGS(HG, hg)
   UTIL_LOOKUP_PROGS(STAT, stat)
   UTIL_LOOKUP_PROGS(TIME, time)
   UTIL_LOOKUP_PROGS(FLOCK, flock)
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index d931491f692..fef845f37a2 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -769,7 +769,6 @@ READELF:=@READELF@
 EXPR:=@EXPR@
 FILE:=@FILE@
 DOT:=@DOT@
-HG:=@HG@
 GIT:=@GIT@
 OBJCOPY:=@OBJCOPY@
 SETFILE:=@SETFILE@
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index a9d806da0c0..e281a4ea51b 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -127,14 +127,13 @@ endef
 # the build was created from
 SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
 
-# Locate all hg repositories included in the forest, as absolute paths
+# Locate all sourcecode repositories included in the forest, as absolute paths
 FindAllReposAbs = \
     $(strip $(sort $(dir $(filter-out $(TOPDIR)/build/%, $(wildcard \
-        $(addprefix $(TOPDIR)/, .hg */.hg */*/.hg */*/*/.hg */*/*/*/.hg) \
         $(addprefix $(TOPDIR)/, .git */.git */*/.git */*/*/.git */*/*/*/.git) \
     )))))
 
-# Locate all hg repositories included in the forest, as relative paths
+# Locate all sourcecode repositories included in the forest, as relative paths
 FindAllReposRel = \
     $(strip $(subst $(TOPDIR)/,.,$(patsubst $(TOPDIR)/%/, %, $(FindAllReposAbs))))