tests: force color ansi mode on Windows

tests/test-bookmarks

@@ -1,102 +1,103
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "bookmarks=" >> $HGRCPATH
 
 hg init
 
 echo % no bookmarks
 hg bookmarks
 
 echo % bookmark rev -1
 hg bookmark X
 
 echo % list bookmarks
 hg bookmarks
 
 echo % list bookmarks with color
-hg --config extensions.color= bookmarks --color=always
+hg --config extensions.color= --config color.mode=ansi \
+    bookmarks --color=always
 
 echo a > a
 hg add a
 hg commit -m 0
 
 echo % bookmark X moved to rev 0
 hg bookmarks
 
 echo % look up bookmark
 hg log -r X
 
 echo % second bookmark for rev 0
 hg bookmark X2
 
 echo % bookmark rev -1 again
 hg bookmark -r null Y
 
 echo % list bookmarks
 hg bookmarks
 
 echo b > b
 hg add b
 hg commit -m 1
 
 echo % bookmarks X and X2 moved to rev 1, Y at rev -1
 hg bookmarks
 
 echo % bookmark rev 0 again
 hg bookmark -r 0 Z
 
 echo c > c
 hg add c
 hg commit -m 2
 
 echo % bookmarks X and X2 moved to rev 2, Y at rev -1, Z at rev 0
 hg bookmarks
 
 echo % rename nonexistent bookmark
 hg bookmark -m A B
 
 echo % rename to existent bookmark
 hg bookmark -m X Y
 
 echo % force rename to existent bookmark
 hg bookmark -f -m X Y
 
 echo % list bookmarks
 hg bookmark
 
 echo % rename without new name
 hg bookmark -m Y
 
 echo % delete without name
 hg bookmark -d
 
 echo % delete nonexistent bookmark
 hg bookmark -d A
 
 echo % bookmark name with spaces should be stripped
 hg bookmark ' x  y '
 
 echo % list bookmarks
 hg bookmarks
 
 echo % look up stripped bookmark name
 hg log -r 'x  y'
 
 echo % reject bookmark name with newline
 hg bookmark '
 '
 
 echo % bookmark with existing name
 hg bookmark Z
 
 echo % force bookmark with existing name
 hg bookmark -f Z
 
 echo % list bookmarks
 hg bookmark
 
 echo % revision but no bookmark name
 hg bookmark -r .
 
 true

tests/test-bookmarks-current

@@ -1,58 +1,59
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "bookmarks=" >> $HGRCPATH
 
 echo "[bookmarks]" >> $HGRCPATH
 echo "track.current = True" >> $HGRCPATH
 
 hg init
 
 echo % no bookmarks
 hg bookmarks
 
 echo % set bookmark X
 hg bookmark X
 
 echo % list bookmarks
 hg bookmark
 
 echo % list bookmarks with color
-hg --config extensions.color= bookmark --color=always
+hg --config extensions.color= --config color.mode=ansi \
+    bookmark --color=always
 
 echo % update to bookmark X
 hg update X
 
 echo % list bookmarks
 hg bookmarks
 
 echo % rename
 hg bookmark -m X Z
 
 echo % list bookmarks
 hg bookmarks
 
 echo % new bookmark Y
 hg bookmark Y
 
 echo % list bookmarks
 hg bookmark
 
 echo % commit
 echo 'b' > b
 hg add b
 hg commit -m'test'
 
 echo % list bookmarks
 hg bookmark
 
 echo % delete bookmarks
 hg bookmark -d Y
 hg bookmark -d Z
 
 echo % list bookmarks
 hg bookmark
 
 echo % update to tip
 hg update tip
 

tests/test-churn

@@ -1,70 +1,71
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "churn=" >> $HGRCPATH
 
 echo % create test repository
 hg init repo
 cd repo
 echo a > a
 hg ci -Am adda -u user1 -d 6:00
 echo b >> a
 echo b > b
 hg ci -m changeba -u user2 -d 9:00 a
 hg ci -Am addb -u user2 -d 9:30
 echo c >> a
 echo c >> b
 echo c > c
 hg ci -m changeca -u user3 -d 12:00 a
 hg ci -m changecb -u user3 -d 12:15 b
 hg ci -Am addc -u user3 -d 12:30
 mkdir -p d/e
 echo abc > d/e/f1.txt
 hg ci -Am "add d/e/f1.txt" -u user1 -d 12:45 d/e/f1.txt
 mkdir -p d/g
 echo def > d/g/f2.txt
 hg ci -Am "add d/g/f2.txt" -u user1 -d 13:00 d/g/f2.txt
 
 echo % churn separate directories
 cd d
 hg churn e
 echo % churn all
 hg churn
 echo % churn up to rev 2
 hg churn -r :2
 cd ..
 echo % churn with aliases
 cat > ../aliases <<EOF
 user1 alias1
 user3 alias3
 EOF
 hg churn --aliases ../aliases
 echo % churn with .hgchurn
 mv ../aliases .hgchurn
 hg churn
 rm .hgchurn
 echo % churn with column specifier
 COLUMNS=40 hg churn
 echo % churn by hour
 hg churn -f '%H' -s
 
 echo % churn with separated added/removed lines
 hg rm d/g/f2.txt
 hg ci -Am "removed d/g/f2.txt" -u user1 -d 14:00 d/g/f2.txt
 hg churn --diffstat
 echo % churn --diffstat with color
-hg --config extensions.color= churn --diffstat --color=always
+hg --config extensions.color= churn --config color.mode=ansi \
+    --diffstat --color=always
 
 echo % changeset number churn
 hg churn -c
 
 cd ..
 
 # issue 833: ZeroDivisionError
 hg init issue-833
 cd issue-833
 touch foo
 hg ci -Am foo
 # this was failing with a ZeroDivisionError
 hg churn
 cd ..

tests/test-grep

@@ -1,99 +1,100
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo import > port
 hg add port
 hg commit -m 0 -u spam -d '0 0'
 echo export >> port
 hg commit -m 1 -u eggs -d '1 0'
 echo export > port
 echo vaportight >> port
 echo 'import/export' >> port
 hg commit -m 2 -u spam -d '2 0'
 echo 'import/export' >> port
 hg commit -m 3 -u eggs -d '3 0'
 head -n 3 port > port1
 mv port1 port
 hg commit -m 4 -u spam -d '4 0'
 echo % pattern error
 hg grep '**test**'
 echo % simple
 hg grep port port
 echo % simple with color
-hg --config extensions.color= grep --color=always port port
+hg --config extensions.color= grep --config color.mode=ansi \
+    --color=always port port
 echo % all
 hg grep --traceback --all -nu port port
 echo % other
 hg grep import port
 
 hg cp port port2
 hg commit -m 4 -u spam -d '5 0'
 echo % follow
 hg grep --traceback -f 'import$' port2
 echo deport >> port2
 hg commit -m 5 -u eggs -d '6 0'
 hg grep -f --all -nu port port2
 
 cd ..
 hg init t2
 cd t2
 hg grep foobar foo
 hg grep foobar
 echo blue >> color
 echo black >> color
 hg add color
 hg ci -m 0
 echo orange >> color
 hg ci -m 1
 echo black > color
 hg ci -m 2
 echo orange >> color
 echo blue >> color
 hg ci -m 3
 hg grep orange
 hg grep --all orange
 
 echo % match in last "line" without newline
 python -c 'fp = open("noeol", "wb"); fp.write("no infinite loop"); fp.close();'
 hg ci -Amnoeol
 echo % last character omitted in output to avoid infinite loop
 hg grep loop
 
 # Got a traceback when using grep on a single
 # revision with renamed files.
 cd ..
 echo % issue 685
 hg init issue685
 cd issue685
 echo octarine > color
 hg ci -Amcolor
 hg rename color colour
 hg ci -Am rename
 hg grep octarine
 # Used to crash here
 hg grep -r 1 octarine
 
 # Issue337: test that grep follows parent-child relationships instead
 # of just using revision numbers.
 cd ..
 echo % issue 337
 hg init issue337
 cd issue337
 
 echo white > color
 hg commit -A -m "0 white"
 
 echo red > color
 hg commit -A -m "1 red"
 
 hg update 0
 echo black > color
 hg commit -A -m "2 black"
 
 hg update --clean 1
 echo blue > color
 hg commit -A -m "3 blue"
 
 hg grep --all red

tests/test-log

@@ -1,183 +1,184
 #!/bin/sh
 
 hg init a
 
 cd a
 echo a > a
 hg ci -Ama -d '1 0'
 
 hg cp a b
 hg ci -mb -d '2 0'
 
 mkdir dir
 hg mv b dir
 hg ci -mc -d '3 0'
 
 hg mv a b
 echo a > d
 hg add d
 hg ci -md -d '4 0'
 
 hg mv dir/b e
 hg ci -me -d '5 0'
 
 hg log a
 echo % -f, directory
 hg log -f dir
 echo % -f, but no args
 hg log -f
 echo % one rename
 hg log -vf a
 echo % many renames
 hg log -vf e
 
 echo '% log copies with --copies'
 hg log -vC --template '{rev} {file_copies}\n'
 echo '% log copies switch without --copies, with old filecopy template'
 hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
 echo '% log copies switch with --copies'
 hg log -vC --template '{rev} {file_copies_switch}\n'
 
 echo '% log copies with hardcoded style and with --style=default'
 hg log -vC -r4
 hg log -vC -r4 --style=default
 
 echo % log copies, non-linear manifest
 hg up -C 3
 hg mv dir/b e
 echo foo > foo
 hg ci -Ame2 -d '6 0'
 hg log -v --template '{rev} {file_copies}\n' -r 5
 
 echo % log copies, execute bit set
 chmod +x e
 hg ci -me3 -d '7 0'
 hg log -v --template '{rev} {file_copies}\n' -r 6
 
 echo '% log -p d'
 hg log -pv d
 
 # log --follow tests
 hg init ../follow
 cd ../follow
 
 echo base > base
 hg ci -Ambase -d '1 0'
 
 echo r1 >> base
 hg ci -Amr1 -d '1 0'
 echo r2 >> base
 hg ci -Amr2 -d '1 0'
 
 hg up -C 1
 echo b1 > b1
 hg ci -Amb1 -d '1 0'
 
 echo % log -f
 hg log -f
 
 hg up -C 0
 echo b2 > b2
 hg ci -Amb2 -d '1 0'
 
 echo % log -f -r 1:tip
 hg log -f -r 1:tip
 
 hg up -C 3
 hg merge tip
 
 echo % log -r .  with two parents
 hg log -r .
 
 hg ci -mm12 -d '1 0'
 
 echo % log -r .  with one parent
 hg log -r .
 
 echo postm >> b1
 hg ci -Amb1.1 -d'1 0'
 
 echo % log --follow-first
 hg log --follow-first
 
 echo % log -P 2
 hg log -P 2
 
 echo '% log -r tip -p --git'
 hg log -r tip -p --git
 
 echo '% log -r ""'
 hg log -r ''
 
 echo '% log -r <some unknown node id>'
 hg log -r 1000000000000000000000000000000000000000
 
 echo '% log -k r1'
 hg log -k r1
 
 echo '% log -d -1'
 hg log -d -1
 
 echo '% log -p -l2 --color=always'
-hg --config extensions.color= log -p -l2 --color=always
+hg --config extensions.color= --config color.mode=ansi \
+    log -p -l2 --color=always
 
 echo '% log -r tip --stat'
 hg log -r tip --stat
 
 cd ..
 
 hg init usertest
 cd usertest
 
 echo a > a
 hg ci -A -m "a" -u "User One <[e-mail]>"
 echo b > b
 hg ci -A -m "b" -u "User Two <[e-mail]>"
 
 hg log -u "User One <[e-mail]>"
 hg log -u "user1" -u "user2"
 hg log -u "user3"
 
 cd ..
 
 hg init branches
 cd branches
 
 echo a > a
 hg ci -A -m "commit on default"
 hg branch test
 echo b > b
 hg ci -A -m "commit on test"
 
 hg up default
 echo c > c
 hg ci -A -m "commit on default"
 hg up test
 echo c > c
 hg ci -A -m "commit on test"
 
 echo '% log -b default'
 hg log -b default
 
 echo '% log -b test'
 hg log -b test
 
 echo '% log -b dummy'
 hg log -b dummy
 
 echo '% log -b .'
 hg log -b .
 
 echo '% log -b default -b test'
 hg log -b default -b test
 
 echo '% log -b default -b .'
 hg log -b default -b .
 
 echo '% log -b . -b test'
 hg log -b . -b test
 
 echo '% log -b 2'
 hg log -b 2
 
 exit 0

tests/test-mq-guards

@@ -1,167 +1,168
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 
 hg init
 hg qinit
 
 echo x > x
 hg ci -Ama
 
 hg qnew a.patch
 echo a > a
 hg add a
 hg qrefresh
 
 hg qnew b.patch
 echo b > b
 hg add b
 hg qrefresh
 
 hg qnew c.patch
 echo c > c
 hg add c
 hg qrefresh
 
 hg qpop -a
 
 echo % should fail
 hg qguard does-not-exist.patch +bleh
 
 echo % should fail
 hg qguard +fail
 
 hg qpush
 echo % should guard a.patch
 hg qguard +a
 echo % should print +a
 hg qguard
 hg qpop
 
 echo % should fail
 hg qpush a.patch
 
 hg qguard a.patch
 echo % should push b.patch
 hg qpush
 
 hg qpop
 echo % test selection of an empty guard
 hg qselect ""
 hg qselect a
 echo % should push a.patch
 hg qpush
 
 hg qguard -- c.patch -a
 echo % should print -a
 hg qguard c.patch
 
 echo % should skip c.patch
 hg qpush -a
 echo % should display b.patch
 hg qtop
 
 hg qguard -n c.patch
 echo % should push c.patch
 hg qpush -a
 
 hg qpop -a
 hg qselect -n
 echo % should push all
 hg qpush -a
 
 hg qpop -a
 hg qguard a.patch +1
 hg qguard b.patch +2
 hg qselect 1
 echo % should push a.patch, not b.patch
 hg qpush
 hg qpush
 hg qpop -a
 
 hg qselect 2
 echo % should push b.patch
 hg qpush
 hg qpush -a
 # Used to be an issue with holes in the patch sequence
 # So, put one hole on the base and ask for topmost patch.
 hg qtop
 hg qpop -a
 
 hg qselect 1 2
 echo % should push a.patch, b.patch
 hg qpush
 hg qpush
 hg qpop -a
 
 hg qguard -- a.patch +1 +2 -3
 hg qselect 1 2 3
 echo % list patches and guards
 hg qguard -l
 echo % list patches and guards with color
-hg --config extensions.color= qguard -l --color=always
+hg --config extensions.color= qguard --config color.mode=ansi \
+    -l --color=always
 echo % list series
 hg qseries -v
 echo % list guards
 hg qselect
 echo % should push b.patch
 hg qpush
 
 hg qpush -a
 hg qselect -n --reapply
 echo % guards in series file: +1 +2 -3
 hg qselect -s
 echo % should show c.patch
 hg qapplied
 
 hg qrename a.patch new.patch
 echo % should show :
 echo % new.patch: +1 +2 -3
 echo % b.patch: +2
 echo % c.patch: unguarded
 hg qguard -l
 
 hg qnew d.patch
 hg qpop
 echo % should show new.patch and b.patch as Guarded, c.patch as Applied
 echo % and d.patch as Unapplied
 hg qseries -v
 echo % qseries again, but with color
 hg --config extensions.color= qseries -v --color=always
 
 hg qguard d.patch +2
 echo % new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded.
 hg qseries -v
 
 qappunappv()
 {
     for command in qapplied "qapplied -v" qunapplied "qunapplied -v"; do
         echo % hg $command
         hg $command
     done
 }
 
 hg qpop -a
 hg qguard -l
 qappunappv
 hg qselect 1
 qappunappv
 hg qpush -a
 qappunappv
 hg qselect 2
 qappunappv
 
 for patch in `hg qseries`; do
     echo % hg qapplied $patch
     hg qapplied $patch
     echo % hg qunapplied $patch
     hg qunapplied $patch
 done
 
 echo % hg qseries -m: only b.patch should be shown
 echo the guards file was not ignored in the past
 hg qdelete -k b.patch
 hg qseries -m
 echo % hg qseries -m with color
 hg --config extensions.color= qseries -m --color=always

tests/test-status-color

@@ -1,120 +1,122
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "color=" >> $HGRCPATH
+echo "[color]" >> $HGRCPATH
+echo "mode=ansi" >> $HGRCPATH
 
 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 --color=always
 echo "hg status . in repo root:"
 hg status --color=always .
 for dir in a b a/1 b/1 b/2; do
     echo "hg status in $dir:"
     hg status --color=always --cwd "$dir"
     echo "hg status . in $dir:"
     hg status --color=always --cwd "$dir" .
     echo "hg status .. in $dir:"
     hg status --color=always --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 --color=always
 echo "hg status modified added removed deleted unknown never-existed ignored:"
 hg status --color=always modified added removed deleted unknown never-existed ignored
 hg copy modified copied
 echo "hg status -C:"
 hg status --color=always -C
 echo "hg status -A:"
 hg status --color=always -A
 echo "^ignoreddir$" > .hgignore
 mkdir ignoreddir
 touch ignoreddir/file
 echo "hg status ignoreddir/file:"
 hg status --color=always ignoreddir/file
 echo "hg status -i ignoreddir/file:"
 hg status --color=always -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
 
 echo "% test unknown color"
 hg --config color.status.modified=periwinkle status --color=always
 
 # 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 --color=always $1 > ../a
     hg status --color=always $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
 
 cd ..
 
 # test 'resolve -l'
 hg init repo4
 cd repo4
 echo "file a" > a
 echo "file b" > b
 hg add a b
 hg commit -m "initial"
 echo "file a change 1" > a
 echo "file b change 1" > b
 hg commit -m "head 1"
 hg update 0
 echo "file a change 2" > a
 echo "file b change 2" > b
 hg commit -m "head 2"
 hg merge
 hg resolve -m b
 echo "hg resolve with one unresolved, one resolved:"
 hg resolve --color=always -l