upstream/mercurial-mirror Commit - r17086:5f2cacb7

tests: make histedit tests more resilient to filesystem variation...

Mads Kiilerich -

r17086:5f2cacb7 default

parent child

tests/test-histedit-commute.t

0 +4 -4

 files updated, 0 files merged, 0 files removed, 0 files unresolved
             edit the history
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 3 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               > pick b069cc29fb22 e
               > pick 26f6a030ae82 f
               > EOF
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 3 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               > pick e860deea161a e
               > pick 177f92b77385 c
               > EOF
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 4 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               > pick 99a62755c625 c
               > pick 7c6fdd608667 e
               > EOF
-              $ HGEDITOR="cat $EDITED > " hg histedit bfe4a5a76b37 --keep 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit bfe4a5a76b37 --keep 2>&1 | fixbundle
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-histedit-drop.t

0 +1 -1

             edit the history
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 4 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-histedit-edit.t

0 +6 -8

             edit the history
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 2 files removed, 0 files unresolved
               abort: Make changes as needed, you may commit or record as needed now.
               When you are finished, run hg histedit --continue to resume.
               $ cat > $EDITED <<EOF
               > edit bf757c081cd0 f
               > EOF
-              $ HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit tip 2>&1 | fixbundle
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               abort: Make changes as needed, you may commit or record as needed now.
               When you are finished, run hg histedit --continue to resume.
             say we'll change the message, but don't.
               $ cat > ../edit.sh <<EOF
-              > #!/bin/sh
+              > cat "\$1" | sed s/pick/mess/ > tmp
-              > cat \$1 | sed s/pick/mess/ > tmp
+              > mv tmp "\$1"
-              > mv tmp \$1
               > EOF
-              $ chmod +x ../edit.sh
+              $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle
-              $ HGEDITOR="../edit.sh" hg histedit tip 2>&1 | fixbundle
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg status
               $ cat > $EDITED <<EOF
               > mess bf757c081cd0 f
               > EOF
-              $ HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit tip 2>&1 | fixbundle
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg status

tests/test-histedit-fold-non-commute.t

0 +1 -1

             edit the history
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 out of 1 hunks FAILED -- saving rejects to file e.rej
               abort: Fix up the change and run hg histedit --continue

tests/test-histedit-fold.t

0 +1 -1

             edit the history
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 4 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-histedit-no-change.t

0 +4 -6

               >     # generate an editor script for selecting changesets to be edited
               >     choice=$1  # changesets that should be edited (using sed line ranges)
               >     cat <<EOF | sed 's:^....::'
-              >     #!/bin/sh
               >     # editing the rules, replacing 'pick' with 'edit' for the chosen lines
-              >     sed '${choice}s:^pick:edit:' \$1 > \${1}.tmp
+              >     sed '${choice}s:^pick:edit:' "\$1" > "\${1}.tmp"
-              >     mv \${1}.tmp \$1
+              >     mv "\${1}.tmp" "\$1"
               >     # displaying the resulting rules, minus comments and empty lines
-              >     sed '/^#/d;/^$/d;s:^:| :' \$1 >&2
+              >     sed '/^#/d;/^$/d;s:^:| :' "\$1" >&2
               > EOF
               > }
               >     number="$2"  # number of changesets considered (from tip)
               >     comment="$3"
               >     geneditor "${choice}" > edit.sh
-              >     chmod +x edit.sh
               >     echo % start editing the history ${comment}
-              >     HGEDITOR=./edit.sh hg histedit -- -${number} 2>&1 | fixbundle
+              >     HGEDITOR="sh ./edit.sh" hg histedit -- -${number} 2>&1 | fixbundle
               > }
               $ continueediting ()

tests/test-histedit-non-commute-abort.t

0 +1 -1

             edit the history
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 out of 1 hunks FAILED -- saving rejects to file e.rej
               abort: Fix up the change and run hg histedit --continue

tests/test-histedit-non-commute.t

0 +4 -4

             edit the history
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 out of 1 hunks FAILED -- saving rejects to file e.rej
               abort: Fix up the change and run hg histedit --continue
             edit the history
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 out of 1 hunks FAILED -- saving rejects to file e.rej
               abort: Fix up the change and run hg histedit --continue
               > EOF
             edit the history, this time with a fold action
-              $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 out of 1 hunks FAILED -- saving rejects to file e.rej
               abort: Fix up the change and run hg histedit --continue
               $ echo a > e
               $ hg add e
-              $ HGEDITOR="cat $EDITED > " hg histedit --continue 2>&1 | fixbundle
+              $ HGEDITOR="cat \"$EDITED\" > " hg histedit --continue 2>&1 | fixbundle
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               file e already exists
 out of 1 hunks FAILED -- saving rejects to file e.rej

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages