Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-subrepo-recursion.t
changeset 12588 41fa32a6b6f8
parent 12587 e3247ceaca5e
child 12591 4b9f23885a55 
--- a/tests/test-subrepo-recursion.t	Thu Sep 30 09:49:40 2010 +0200
+++ b/tests/test-subrepo-recursion.t	Tue Sep 28 13:09:22 2010 +0200
@@ -1,8 +1,6 @@
 Make status look into subrepositories by default:
 
   $ echo '[defaults]' >> $HGRCPATH
-  $ echo 'status = -S' >> $HGRCPATH
-  $ echo 'diff = --nodates -S' >> $HGRCPATH
 
 Create test repository:
 
@@ -36,7 +34,7 @@
 
 Test recursive status without committing anything:
 
-  $ hg status
+  $ hg status -S
   A .hgsub
   A foo/.hgsub
   A foo/bar/z.txt
@@ -45,7 +43,7 @@
 
 Test recursive diff without committing anything:
 
-  $ hg diff foo
+  $ hg diff --nodates -S foo
   diff -r 000000000000 foo/.hgsub
   --- /dev/null
   +++ b/foo/.hgsub
@@ -88,10 +86,10 @@
 
   $ echo y3 >> foo/y.txt
   $ echo z3 >> foo/bar/z.txt
-  $ hg status
+  $ hg status -S
   M foo/bar/z.txt
   M foo/y.txt
-  $ hg diff
+  $ hg diff --nodates -S
   diff -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
@@ -109,14 +107,14 @@
 
 Status call crossing repository boundaries:
 
-  $ hg status foo/bar/z.txt
+  $ hg status -S foo/bar/z.txt
   M foo/bar/z.txt
-  $ hg status -I 'foo/?.txt'
+  $ hg status -S -I 'foo/?.txt'
   M foo/y.txt
-  $ hg status -I '**/?.txt'
+  $ hg status -S -I '**/?.txt'
   M foo/bar/z.txt
   M foo/y.txt
-  $ hg diff -I '**/?.txt'
+  $ hg diff --nodates -S -I '**/?.txt'
   diff -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
@@ -137,11 +135,11 @@
   $ mkdir dir
   $ cd dir
   $ echo a1 > a.txt
-  $ hg status
+  $ hg status -S
   M foo/bar/z.txt
   M foo/y.txt
   ? dir/a.txt
-  $ hg diff
+  $ hg diff --nodates -S
   diff -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
@@ -159,11 +157,11 @@
 
 Status with relative path:
 
-  $ hg status ..
+  $ hg status -S ..
   M ../foo/bar/z.txt
   M ../foo/y.txt
   ? a.txt
-  $ hg diff ..
+  $ hg diff --nodates -S ..
   diff -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
@@ -207,13 +205,13 @@
 
 Status between revisions:
 
-  $ hg status
-  $ hg status --rev 0:1
+  $ hg status -S
+  $ hg status -S --rev 0:1
   M .hgsubstate
   M foo/.hgsubstate
   M foo/bar/z.txt
   M foo/y.txt
-  $ hg diff -I '**/?.txt' --rev 0:1
+  $ hg diff --nodates -S -I '**/?.txt' --rev 0:1
   diff -r af048e97ade2 -r d254738c5f5e foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
@@ -281,7 +279,7 @@
 Make nested change:
 
   $ echo y4 >> foo/y.txt
-  $ hg diff
+  $ hg diff --nodates -S
   diff -r 65903cebad86 foo/y.txt
   --- a/foo/y.txt
   +++ b/foo/y.txt
@@ -313,6 +311,7 @@
   searching for changes
   no changes found
 
+
 Switch to original repo and setup default path:
 
   $ cd ../repo
@@ -349,5 +348,5 @@
 Test missing subrepo:
 
   $ rm -r foo
-  $ hg status
+  $ hg status -S
   warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo"
mercurial