Patchwork [1,of,6] py3: quote $PYTHON in test-merge-symlinks.t

login
register
mail settings
Submitter Matt Harbison
Date Oct. 2, 2018, 4:30 a.m.
Message ID <f03d553395ca841edc5b.1538454631@Envy>
Download mbox | patch
Permalink /patch/35281/
State Accepted
Headers show

Comments

Matt Harbison - Oct. 2, 2018, 4:30 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1538437145 14400
#      Mon Oct 01 19:39:05 2018 -0400
# Node ID f03d553395ca841edc5bd3bc5953758c2ed8e16a
# Parent  a6f8ab537908b0b4d8abd0c5c9c971964dec7128
py3: quote $PYTHON in test-merge-symlinks.t
Gregory Szorc - Oct. 2, 2018, 5:22 a.m.
On Mon, Oct 1, 2018 at 9:32 PM Matt Harbison <mharbison72@gmail.com> wrote:

> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1538437145 14400
> #      Mon Oct 01 19:39:05 2018 -0400
> # Node ID f03d553395ca841edc5bd3bc5953758c2ed8e16a
> # Parent  a6f8ab537908b0b4d8abd0c5c9c971964dec7128
> py3: quote $PYTHON in test-merge-symlinks.t
>

Queued, thanks.

I wasn't 100% about some of the string casts in part 2. But it is test-only
code and I don't think we care that much.


>
> diff --git a/tests/test-merge-symlinks.t b/tests/test-merge-symlinks.t
> --- a/tests/test-merge-symlinks.t
> +++ b/tests/test-merge-symlinks.t
> @@ -38,7 +38,7 @@ a file, once as a link. Bundle was gener
>  Merge them and display *_ISLINK vars
>  merge heads
>
> -  $ hg merge --tool="$PYTHON ../echo.py"
> +  $ hg merge --tool="\"$PYTHON\" ../echo.py"
>    merging l
>    HG_FILE l
>    HG_MY_ISLINK 1
> @@ -54,7 +54,7 @@ merge working directory
>    $ hg up -C 2
>    1 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    $ hg copy l l2
> -  $ HGMERGE="$PYTHON ../echo.py" hg up 3
> +  $ HGMERGE="\"$PYTHON\" ../echo.py" hg up 3
>    merging l2
>    HG_FILE l2
>    HG_MY_ISLINK 1
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/test-merge-symlinks.t b/tests/test-merge-symlinks.t
--- a/tests/test-merge-symlinks.t
+++ b/tests/test-merge-symlinks.t
@@ -38,7 +38,7 @@  a file, once as a link. Bundle was gener
 Merge them and display *_ISLINK vars
 merge heads
 
-  $ hg merge --tool="$PYTHON ../echo.py"
+  $ hg merge --tool="\"$PYTHON\" ../echo.py"
   merging l
   HG_FILE l
   HG_MY_ISLINK 1
@@ -54,7 +54,7 @@  merge working directory
   $ hg up -C 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg copy l l2
-  $ HGMERGE="$PYTHON ../echo.py" hg up 3
+  $ HGMERGE="\"$PYTHON\" ../echo.py" hg up 3
   merging l2
   HG_FILE l2
   HG_MY_ISLINK 1