Mercurial > hg
view tests/test-status @ 9725:3f522d2fa633
diff: add --inverse option
Most of the time, one can reverse a diff by swapping the revisions passed with
-r but it happens that if you use the global -R, and diff against the tip of
the current repo, you can't swap the revisions. One use-case for that is
reviewing changes from a bundle before unbundling. One could also pipe the
output of `hg diff` to a command line filter that reverses the diff, but that
would remove the benefit from color diffs. Therefore, having an option in
`hg diff` to reverse a diff is a good thing.
The option flag selection was tricky. GNU patch uses -R/--reverse but -R is
already used as a global option and --reverse would make --rev ambiguous.
author | Yannick Gingras <ygingras@ygingras.net> |
---|---|
date | Thu, 05 Nov 2009 15:18:56 +0100 |
parents | 991f7518c3f3 |
children | 54cd28258ea7 |
line wrap: on
line source
#!/bin/sh hg init repo1 cd repo1 mkdir a b a/1 b/1 b/2 touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2 echo "hg status in repo root:" hg status echo "hg status . in repo root:" hg status . for dir in a b a/1 b/1 b/2; do echo "hg status in $dir:" hg status --cwd "$dir" echo "hg status . in $dir:" hg status --cwd "$dir" . echo "hg status .. in $dir:" hg status --cwd "$dir" .. done cd .. hg init repo2 cd repo2 touch modified removed deleted ignored echo "^ignored$" > .hgignore hg ci -A -m 'initial checkin' -d "1000000 0" touch modified added unknown ignored hg add added hg remove removed rm deleted echo "hg status:" hg status echo "hg status modified added removed deleted unknown never-existed ignored:" hg status modified added removed deleted unknown never-existed ignored hg copy modified copied echo "hg status -C:" hg status -C echo "hg status -A:" hg status -A echo "^ignoreddir$" > .hgignore mkdir ignoreddir touch ignoreddir/file echo "hg status ignoreddir/file:" hg status ignoreddir/file echo "hg status -i ignoreddir/file:" hg status -i ignoreddir/file cd .. # check 'status -q' and some combinations hg init repo3 cd repo3 touch modified removed deleted ignored echo "^ignored$" > .hgignore hg commit -A -m 'initial checkin' touch added unknown ignored hg add added echo "test" >> modified hg remove removed rm deleted hg copy modified copied # Run status with 2 different flags. # Check if result is the same or different. # If result is not as expected, raise error assert() { hg status $1 > ../a hg status $2 > ../b out=`diff ../a ../b` if [ $? -ne 0 ]; then out=1 else out=0 fi if [ $3 -eq 0 ]; then df="same" else df="different" fi if [ $out -ne $3 ]; then echo "Error on $1 and $2, should be $df." fi } # assert flag1 flag2 [0-same | 1-different] assert "-q" "-mard" 0 assert "-A" "-marduicC" 0 assert "-qA" "-mardcC" 0 assert "-qAui" "-A" 0 assert "-qAu" "-marducC" 0 assert "-qAi" "-mardicC" 0 assert "-qu" "-u" 0 assert "-q" "-u" 1 assert "-m" "-a" 1 assert "-r" "-d" 1