Patchwork [1,of,2] tests: replace cat.py with cat in test-histedit-fold-non-commute.t

login
register
mail settings
Submitter timeless@mozdev.org
Date March 2, 2016, 10:40 p.m.
Message ID <d74c1e47550daab7959a.1456958433@waste.org>
Download mbox | patch
Permalink /patch/13572/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

timeless@mozdev.org - March 2, 2016, 10:40 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1456956558 0
#      Wed Mar 02 22:09:18 2016 +0000
# Node ID d74c1e47550daab7959a111b03136518998af86d
# Parent  c7f89ad87baef87f00c507545dfd4cc824bc3131
tests: replace cat.py with cat in test-histedit-fold-non-commute.t

Patch

diff --git a/tests/test-histedit-fold-non-commute.t b/tests/test-histedit-fold-non-commute.t
--- a/tests/test-histedit-fold-non-commute.t
+++ b/tests/test-histedit-fold-non-commute.t
@@ -97,13 +97,7 @@ 
   $ hg resolve --mark e
   (no more unresolved files)
   continue: hg histedit --continue
-  $ cat > cat.py <<EOF
-  > import sys
-  > print open(sys.argv[1]).read()
-  > print
-  > print
-  > EOF
-  $ HGEDITOR="python cat.py" hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
+  $ HGEDITOR=cat hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
   d
   ***
   does not commute with e
@@ -117,9 +111,6 @@ 
   HG: branch 'default'
   HG: changed d
   HG: changed e
-  
-  
-  
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change (pick 7b4e2f4b7bcd)