[PATCH] test-histedit: fix HGEDITOR for Windows

Matt Harbison mharbison at attotech.com
Wed May 6 11:32:16 CDT 2015


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1430929086 14400
#      Wed May 06 12:18:06 2015 -0400
# Node ID 217c94fbe75cb14c3a38e41522a83729ad8d90ea
# Parent  c5d4f9cc8da7bb2068457e96e4f74ff694514ced
test-histedit: fix HGEDITOR for Windows

This broke in b5eb01500696 on stable.  Without this, the test failure starts
with:

  @@ -80,17 +80,21 @@
     > EOF
     $ chmod a+x ../editplan.sh
     $ HGEDITOR=../editplan.sh hg histedit --edit-plan
  +  '..' is not recognized as an internal or external command,\r (esc)
  +  operable program or batch file.\r (esc)
  +  abort: edit failed: editplan.sh exited with status 1
  +  [255]
     $ cat .hg/histedit-state
     v1
     [...]

diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t
--- a/tests/test-histedit-edit.t
+++ b/tests/test-histedit-edit.t
@@ -79,7 +79,7 @@ edit the plan via the editor
   > EOF2
   > EOF
   $ chmod a+x ../editplan.sh
-  $ HGEDITOR=../editplan.sh hg histedit --edit-plan
+  $ HGEDITOR='sh ../editplan.sh' hg histedit --edit-plan
   $ cat .hg/histedit-state
   v1
   055a42cdd88768532f9cf79daa407fc8d138de9b


More information about the Mercurial-devel mailing list