[PATCH] tests: edit files in place when using sed
Idan Kamara
idankk86 at gmail.com
Sun May 22 08:28:33 CDT 2011
# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1306069801 -10800
# Node ID 97b742ca3600b5ec7e438013b3df1494f784bfbd
# Parent 2c9f5897d4b7e163502b6ce56287d400da738d89
tests: edit files in place when using sed
diff -r 2c9f5897d4b7 -r 97b742ca3600 tests/test-diff-change.t
--- a/tests/test-diff-change.t Sat May 21 15:09:15 2011 -0500
+++ b/tests/test-diff-change.t Sun May 22 16:10:01 2011 +0300
@@ -37,14 +37,12 @@
$ done
$ hg commit -m "lots of text" # 3
- $ sed -e 's,^2$,x,' file.txt > file.txt.tmp
- $ mv file.txt.tmp file.txt
+ $ sed -i 's,^2$,x,' file.txt
$ hg commit -m "change 2 to x" # 4
$ hg up -r 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ sed -e 's,^8$,y,' file.txt > file.txt.tmp
- $ mv file.txt.tmp file.txt
+ $ sed -i 's,^8$,y,' file.txt
$ hg commit -m "change 8 to y"
created new head
diff -r 2c9f5897d4b7 -r 97b742ca3600 tests/test-merge-internal-tools-pattern.t
--- a/tests/test-merge-internal-tools-pattern.t Sat May 21 15:09:15 2011 -0500
+++ b/tests/test-merge-internal-tools-pattern.t Sun May 22 16:10:01 2011 +0300
@@ -22,16 +22,14 @@
Branch 1: editing line 1:
- $ sed 's/line 1/first line/' f > f.new
- $ mv f.new f
+ $ sed -i 's/line 1/first line/' f
$ hg ci -Am "edited first line"
Branch 2: editing line 3:
$ hg update 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ sed 's/line 3/third line/' f > f.new
- $ mv f.new f
+ $ sed -i 's/line 3/third line/' f
$ hg ci -Am "edited third line"
created new head
@@ -57,8 +55,7 @@
$ hg update -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new
- $ mv .hg/hgrc.new .hg/hgrc
+ $ sed -i 's/internal:fail/internal:local/' .hg/hgrc
$ hg merge
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -76,8 +73,7 @@
$ hg update -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new
- $ mv .hg/hgrc.new .hg/hgrc
+ $ sed -i 's/internal:local/internal:other/' .hg/hgrc
$ hg merge
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
diff -r 2c9f5897d4b7 -r 97b742ca3600 tests/test-qrecord.t
--- a/tests/test-qrecord.t Sat May 21 15:09:15 2011 -0500
+++ b/tests/test-qrecord.t Sun May 22 16:10:01 2011 +0300
@@ -162,13 +162,9 @@
Changing files
- $ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
- $ sed -e 's/b/b b/' 2.txt > 2.txt.new
- $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new
-
- $ mv -f 1.txt.new 1.txt
- $ mv -f 2.txt.new 2.txt
- $ mv -f dir/a.txt.new dir/a.txt
+ $ sed -i 's/2/2 2/;s/4/4 4/' 1.txt
+ $ sed -i 's/b/b b/' 2.txt
+ $ sed -i 's/hello world/hello world!/' dir/a.txt
Whole diff
diff -r 2c9f5897d4b7 -r 97b742ca3600 tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t Sat May 21 15:09:15 2011 -0500
+++ b/tests/test-rebase-abort.t Sun May 22 16:10:01 2011 +0300
@@ -28,8 +28,7 @@
$ hg ci -m L1
created new head
- $ sed -e 's/c2/l2/' common > common.new
- $ mv common.new common
+ $ sed -i 's/c2/l2/' common
$ hg ci -m L2
$ hg tglog
diff -r 2c9f5897d4b7 -r 97b742ca3600 tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t Sat May 21 15:09:15 2011 -0500
+++ b/tests/test-rebase-conflicts.t Sun May 22 16:10:01 2011 +0300
@@ -26,8 +26,7 @@
$ hg ci -m L1
created new head
- $ sed -e 's/c2/l2/' common > common.new
- $ mv common.new common
+ $ sed -i 's/c2/l2/' common
$ hg ci -m L2
$ echo l3 >> extra2
More information about the Mercurial-devel
mailing list