Patchwork D8038: setup: don't skip the search for global hg.exe if there is no local instance

login
register
mail settings
Submitter phabricator
Date Jan. 29, 2020, 11:26 p.m.
Message ID <0e19b558d2ac01c5144cbcc2f474cb1d@localhost.localdomain>
Download mbox | patch
Permalink /patch/44748/
State Not Applicable
Headers show

Comments

phabricator - Jan. 29, 2020, 11:26 p.m.
Closed by commit rHG35289b5654e0: setup: don&#039;t skip the search for global hg.exe if there is no local instance (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8038?vs=19675&id=19688

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8038/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8038

AFFECTED FILES
  setup.py

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -323,7 +323,7 @@ 
     # gives precedence to hg.exe in the current directory, so fall back to the
     # python invocation of local hg, where pythonXY.dll can always be found.
     check_cmd = ['log', '-r.', '-Ttest']
-    if os.name != 'nt':
+    if os.name != 'nt' or not os.path.exists("hg.exe"):
         try:
             retcode, out, err = runcmd(hgcmd + check_cmd, hgenv)
         except EnvironmentError: