[PATCH] tests: unify test-diff-change
Adrian Buehlmann
adrian at cadifra.com
Mon Aug 30 07:42:08 CDT 2010
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1283171895 -7200
# Node ID c285121f2e5c749e48fd9470f06d19289517faab
# Parent ff7c1118a83adff592f6e20d4a5da55926fef323
tests: unify test-diff-change
diff --git a/tests/test-diff-change.out b/tests/test-diff-change.out
deleted file mode 100644
--- a/tests/test-diff-change.out
+++ /dev/null
@@ -1,30 +0,0 @@
-invoking hg diff --nodates --change 1:
-diff -r 4bb65dda5db4 -r e9b286083166 file.txt
---- a/file.txt
-+++ b/file.txt
-@@ -1,1 +1,1 @@
--first
-+second
-
-invoking hg diff --nodates --change e9b286083166:
-diff -r 4bb65dda5db4 -r e9b286083166 file.txt
---- a/file.txt
-+++ b/file.txt
-@@ -1,1 +1,1 @@
--first
-+second
-
-invoking hg diff --nodates --change 6:
-diff -r e8a0797e73a6 -r aa9873050139 file.txt
---- a/file.txt
-+++ b/file.txt
-@@ -6,6 +6,6 @@
- 5
- 6
- 7
--8
-+y
- 9
- 10
-
-EOF
diff --git a/tests/test-diff-change b/tests/test-diff-change.t
old mode 100755
new mode 100644
rename from tests/test-diff-change
rename to tests/test-diff-change.t
--- a/tests/test-diff-change
+++ b/tests/test-diff-change.t
@@ -1,63 +1,86 @@
-#!/bin/sh -e
+Testing diff --change
-# test of hg diff --change
+ $ hg init a
+ $ cd a
-set -e
+ $ echo "first" > file.txt
+ $ hg add file.txt
+ $ hg commit -m 'first commit' # 0
-ec() {
- echo "invoking $@:"
- "$@"
-}
+ $ echo "second" > file.txt
+ $ hg commit -m 'second commit' # 1
-hg init a
-cd a
+ $ echo "third" > file.txt
+ $ hg commit -m 'third commit' # 2
-echo "first" > file.txt
-hg add file.txt
-hg commit -m 'first commit' # 0
+ $ hg diff --nodates --change 1
+ diff -r 4bb65dda5db4 -r e9b286083166 file.txt
+ --- a/file.txt
+ +++ b/file.txt
+ @@ -1,1 +1,1 @@
+ -first
+ +second
-echo "second" > file.txt
-hg commit -m 'second commit' # 1
+ $ hg diff --change e9b286083166
+ diff -r 4bb65dda5db4 -r e9b286083166 file.txt
+ --- a/file.txt Thu Jan 01 00:00:00 1970 +0000
+ +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
+ @@ -1,1 +1,1 @@
+ -first
+ +second
-echo "third" > file.txt
-hg commit -m 'third commit' # 2
-ec hg diff --nodates --change 1
+Testing diff --change when merge:
-echo
+ $ for i in 1 2 3 4 5 6 7 8 9 10; do
+ $ echo $i >> file.txt
+ $ done
+ $ hg commit -m "lots of text" # 3
-#rev=$(hg log -r 1 --template '{node|short}')
-rev=e9b286083166
-ec hg diff --nodates --change "$rev"
+ $ sed -e 's,^2$,x,' file.txt > file.txt.tmp
+ $ mv file.txt.tmp file.txt
+ $ hg commit -m "change 2 to x" # 4
-##
-# Testing diff -c when merge
+ $ 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
+ $ hg commit -m "change 8 to y"
+ created new head
-for i in 1 2 3 4 5 6 7 8 9 10; do
- echo $i >> file.txt
-done
-hg commit -m "lots of text" # 3
+ $ hg up -C -r 4
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg merge -r 5
+ merging file.txt
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+ $ hg commit -m "merge 8 to y" # 6
-sed -e 's,^2$,x,' file.txt > file.txt.tmp
-mv file.txt.tmp file.txt
-hg commit -m "changed 2 to x" # 4
+ $ hg diff --change 5
+ diff -r ae119d680c82 -r 9085c5c02e52 file.txt
+ --- a/file.txt Thu Jan 01 00:00:00 1970 +0000
+ +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
+ @@ -6,6 +6,6 @@
+ 5
+ 6
+ 7
+ -8
+ +y
+ 9
+ 10
-hg up -r 3 > /dev/null 2>&1 # updated, merged, removed, unresolved
-sed -e 's,^8$,y,' file.txt > file.txt.tmp
-mv file.txt.tmp file.txt
-hg commit -m "change 8 to y" > /dev/null 2>&1 # 5 # created new head
+must be similar to 'hg diff --change 5':
-hg up -C -r 4 > /dev/null 2>&1 # updated, merged, removed, unresolved
-hg merge -r 5 > /dev/null 2>&1 # updated, merged, removed, unresolved
-hg commit -m "merging 8 to y" # 6
+ $ hg diff -c 6
+ diff -r 273b50f17c6d -r 979ca961fd2e file.txt
+ --- a/file.txt Thu Jan 01 00:00:00 1970 +0000
+ +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
+ @@ -6,6 +6,6 @@
+ 5
+ 6
+ 7
+ -8
+ +y
+ 9
+ 10
-echo
-ec hg diff --nodates --change 6 # must be similar to hg diff --nodates --change 5
-
-#echo
-#hg log
-
-echo
-echo "EOF"
-
-# vim: set ts=4 sw=4 et:
More information about the Mercurial-devel
mailing list