From 7ec8a18514280065d7afe20c40cdebcad7919897 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 28 Dec 2016 14:37:44 -0800
Subject: [PATCH] Issue #29080: Removes hard dependency on hg.exe from
 PC/build.bat

---
 Misc/NEWS         | 2 ++
 PCbuild/build.bat | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 11ec5f5811e..47db9aaced3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -616,6 +616,8 @@ Windows
 Build
 -----
 
+- Issue #29080: Removes hard dependency on hg.exe from PC/build.bat
+
 - Issue #23903: Added missed names to PC/python3.def.
 
 - Issue #10656: Fix out-of-tree building on AIX.  Patch by Tristan Carel and
diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 98fa2671f63..9e63a84bde4 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -106,7 +106,8 @@ if "%platf%"=="x64" (
 )
 
 if not exist "%HG%" where hg > "%TEMP%\hg.loc" 2> nul && set /P HG= < "%TEMP%\hg.loc" & del "%TEMP%\hg.loc"
-if not exist "%HG%" echo Cannot find Mercurial on PATH && exit /B 1
+if exist "%HG%" set HGProperty=/p:HG="%HG%"
+if not exist "%HG%" echo Cannot find Mercurial on PATH & set HGProperty=
 
 rem Setup the environment
 call "%dir%env.bat" %vs_platf% >nul
@@ -144,8 +145,7 @@ msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^
  /p:Configuration=%conf% /p:Platform=%platf%^
  /p:IncludeExternals=%IncludeExternals%^
  /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
- /p:UseTestMarker=%UseTestMarker%^
- /p:HG="%HG%"^
+ /p:UseTestMarker=%UseTestMarker% %HGProperty%^
  %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 @echo off