py3: suppress the return value from .write() call

Differential Revision: https://phab.mercurial-scm.org/D4591

tests/test-convert-mtn.t

@@ -1,399 +1,399 b''
 #require mtn
 
 Monotone directory is called .monotone on *nix and monotone
 on Windows.
 
 #if windows
 
   $ mtndir=monotone
 
 #else
 
   $ mtndir=.monotone
 
 #endif
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert=" >> $HGRCPATH
 
 Windows version of monotone home
 
   $ APPDATA=$HOME; export APPDATA
 
 tedious monotone keys configuration
 The /dev/null redirection is necessary under Windows, or
 it complains about home directory permissions
 
   $ mtn --quiet genkey [e-mail] 1>/dev/null 2>&1 <<EOF
   > passphrase
   > passphrase
   > EOF
   $ cat >> $HOME/$mtndir/monotonerc <<EOF
   > function get_passphrase(keypair_id)
   >     return "passphrase"
   > end
   > EOF
 
 create monotone repository
 
   $ mtn db init --db=repo.mtn
   $ mtn --db=repo.mtn --branch=com.selenic.test setup workingdir
   $ cd workingdir
   $ echo a > a
   $ mkdir dir
   $ echo b > dir/b
   $ echo d > dir/d
-  $ $PYTHON -c 'open("bin", "wb").write(b"a\\x00b")'
+  $ $PYTHON -c 'open("bin", "wb").write(b"a\\x00b") and None'
   $ echo c > c
   $ mtn add a dir/b dir/d c bin
   mtn: adding 'a' to workspace manifest
   mtn: adding 'bin' to workspace manifest
   mtn: adding 'c' to workspace manifest
   mtn: adding 'dir' to workspace manifest
   mtn: adding 'dir/b' to workspace manifest
   mtn: adding 'dir/d' to workspace manifest
   $ mtn ci -m initialize
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 0f6e5e4f2e7d2a8ef312408f57618abf026afd90
 
 update monotone working directory
 
   $ mtn mv a dir/a
   mtn: skipping 'dir', already accounted for in workspace
   mtn: renaming 'a' to 'dir/a' in workspace manifest
   $ echo a >> dir/a
   $ echo b >> dir/b
   $ mtn drop c
   mtn: dropping 'c' from workspace manifest
-  $ $PYTHON -c 'open("bin", "wb").write(b"b\\x00c")'
+  $ $PYTHON -c 'open("bin", "wb").write(b"b\\x00c") and None'
   $ mtn ci -m update1
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 51d0a982464573a2a2cf5ee2c9219c652aaebeff
   $ cd ..
 
 convert once
 
   $ hg convert -s mtn repo.mtn
   assuming destination repo.mtn-hg
   initializing destination repo.mtn-hg repository
   scanning source...
   sorting...
   converting...
   1 initialize
   0 update1
   $ cd workingdir
   $ echo e > e
   $ mtn add e
   mtn: adding 'e' to workspace manifest
   $ mtn drop dir/b
   mtn: dropping 'dir/b' from workspace manifest
   $ mtn mv bin bin2
   mtn: renaming 'bin' to 'bin2' in workspace manifest
   $ mtn ci -m 'update2 "with" quotes'
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision ebe58335d85d8cb176b6d0a12be04f5314b998da
 
 test directory move
 
   $ mkdir -p dir1/subdir1
   $ mkdir -p dir1/subdir2_other
   $ echo file1 > dir1/subdir1/file1
   $ echo file2 > dir1/subdir2_other/file1
   $ mtn add dir1/subdir1/file1 dir1/subdir2_other/file1
   mtn: adding 'dir1' to workspace manifest
   mtn: adding 'dir1/subdir1' to workspace manifest
   mtn: adding 'dir1/subdir1/file1' to workspace manifest
   mtn: adding 'dir1/subdir2_other' to workspace manifest
   mtn: adding 'dir1/subdir2_other/file1' to workspace manifest
   $ mtn ci -m createdir1
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision a8d62bc04fee4d2936d28e98bbcc81686dd74306
   $ mtn rename dir1/subdir1 dir1/subdir2
   mtn: skipping 'dir1', already accounted for in workspace
   mtn: renaming 'dir1/subdir1' to 'dir1/subdir2' in workspace manifest
   $ mtn ci -m movedir1
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 2c3d241bbbfe538b1b51d910f5676407e3f4d3a6
 
 test subdirectory move
 
   $ mtn mv dir dir2
   mtn: renaming 'dir' to 'dir2' in workspace manifest
   $ echo newfile > dir2/newfile
   $ mtn drop dir2/d
   mtn: dropping 'dir2/d' from workspace manifest
   $ mtn add dir2/newfile
   mtn: adding 'dir2/newfile' to workspace manifest
   $ mtn ci -m movedir
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision fdb5a02dae8bfce3a79b3393680af471016e1b4c
 
 Test directory removal with empty directory
 
   $ mkdir dir2/dir
   $ mkdir dir2/dir/subdir
   $ echo f > dir2/dir/subdir/f
   $ mkdir dir2/dir/emptydir
   $ mtn add --quiet -R dir2/dir
   $ mtn ci -m emptydir
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 8bbf76d717001d24964e4604739fdcd0f539fc88
   $ mtn drop -R dir2/dir
   mtn: dropping 'dir2/dir/subdir/f' from workspace manifest
   mtn: dropping 'dir2/dir/subdir' from workspace manifest
   mtn: dropping 'dir2/dir/emptydir' from workspace manifest
   mtn: dropping 'dir2/dir' from workspace manifest
   $ mtn ci -m dropdirectory
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 2323d4bc324e6c82628dc04d47a9fd32ad24e322
 
 test directory and file move
 
   $ mkdir -p dir3/d1
   $ echo a > dir3/a
   $ mtn add dir3/a dir3/d1
   mtn: adding 'dir3' to workspace manifest
   mtn: adding 'dir3/a' to workspace manifest
   mtn: adding 'dir3/d1' to workspace manifest
   $ mtn ci -m dirfilemove
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 47b192f720faa622f48c68d1eb075b26d405aa8b
   $ mtn mv dir3/a dir3/d1/a
   mtn: skipping 'dir3/d1', already accounted for in workspace
   mtn: renaming 'dir3/a' to 'dir3/d1/a' in workspace manifest
   $ mtn mv dir3/d1 dir3/d2
   mtn: skipping 'dir3', already accounted for in workspace
   mtn: renaming 'dir3/d1' to 'dir3/d2' in workspace manifest
   $ mtn ci -m dirfilemove2
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 8b543a400d3ee7f6d4bb1835b9b9e3747c8cb632
 
 test directory move into another directory move
 
   $ mkdir dir4
   $ mkdir dir5
   $ echo a > dir4/a
   $ mtn add dir4/a dir5
   mtn: adding 'dir4' to workspace manifest
   mtn: adding 'dir4/a' to workspace manifest
   mtn: adding 'dir5' to workspace manifest
   $ mtn ci -m dirdirmove
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 466e0b2afc7a55aa2b4ab2f57cb240bb6cd66fc7
   $ mtn mv dir5 dir6
   mtn: renaming 'dir5' to 'dir6' in workspace manifest
   $ mtn mv dir4 dir6/dir4
   mtn: skipping 'dir6', already accounted for in workspace
   mtn: renaming 'dir4' to 'dir6/dir4' in workspace manifest
   $ mtn ci -m dirdirmove2
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 3d1f77ebad0c23a5d14911be3b670f990991b749
 
 test diverging directory moves
 
   $ mkdir -p dir7/dir9/dir8
   $ echo a > dir7/dir9/dir8/a
   $ echo b > dir7/dir9/b
   $ echo c > dir7/c
   $ mtn add -R dir7
   mtn: adding 'dir7' to workspace manifest
   mtn: adding 'dir7/c' to workspace manifest
   mtn: adding 'dir7/dir9' to workspace manifest
   mtn: adding 'dir7/dir9/b' to workspace manifest
   mtn: adding 'dir7/dir9/dir8' to workspace manifest
   mtn: adding 'dir7/dir9/dir8/a' to workspace manifest
   $ mtn ci -m divergentdirmove
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 08a08511f18b428d840199b062de90d0396bc2ed
   $ mtn mv dir7 dir7-2
   mtn: renaming 'dir7' to 'dir7-2' in workspace manifest
   $ mtn mv dir7-2/dir9 dir9-2
   mtn: renaming 'dir7-2/dir9' to 'dir9-2' in workspace manifest
   $ mtn mv dir9-2/dir8 dir8-2
   mtn: renaming 'dir9-2/dir8' to 'dir8-2' in workspace manifest
   $ mtn ci -m divergentdirmove2
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision 4a736634505795f17786fffdf2c9cbf5b11df6f6
 
 test large file support (> 32kB)
 
   >>> fp = open('large-file', 'wb')
-  >>> for x in range(10000): fp.write(b'%d\n' % x)
+  >>> for x in range(10000): fp.write(b'%d\n' % x) and None
   >>> fp.close()
   $ md5sum.py large-file
   5d6de8a95c3b6bf9e0ffb808ba5299c1  large-file
   $ mtn add large-file
   mtn: adding 'large-file' to workspace manifest
   $ mtn ci -m largefile
   mtn: beginning commit on branch 'com.selenic.test'
   mtn: committed revision f0a20fecd10dc4392d18fe69a03f1f4919d3387b
 
 test suspending (closing a branch)
 
   $ mtn suspend f0a20fecd10dc4392d18fe69a03f1f4919d3387b 2> /dev/null
   $ cd ..
 
 convert incrementally
 
   $ hg convert -s mtn repo.mtn
   assuming destination repo.mtn-hg
   scanning source...
   sorting...
   converting...
   12 update2 "with" quotes
   11 createdir1
   10 movedir1
   9 movedir
   8 emptydir
   7 dropdirectory
   6 dirfilemove
   5 dirfilemove2
   4 dirdirmove
   3 dirdirmove2
   2 divergentdirmove
   1 divergentdirmove2
   0 largefile
   $ glog()
   > {
   >     hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
   > }
   $ cd repo.mtn-hg
   $ hg up -C
   12 files updated, 0 files merged, 0 files removed, 0 files unresolved
   no open descendant heads on branch "com.selenic.test", updating to a closed head
   (committing will reopen branch "com.selenic.test")
   $ glog
   @  14 "largefile" files: large-file
   |
   o  13 "divergentdirmove2" files: dir7-2/c dir7/c dir7/dir9/b dir7/dir9/dir8/a dir8-2/a dir9-2/b
   |
   o  12 "divergentdirmove" files: dir7/c dir7/dir9/b dir7/dir9/dir8/a
   |
   o  11 "dirdirmove2" files: dir4/a dir6/dir4/a
   |
   o  10 "dirdirmove" files: dir4/a
   |
   o  9 "dirfilemove2" files: dir3/a dir3/d2/a
   |
   o  8 "dirfilemove" files: dir3/a
   |
   o  7 "dropdirectory" files: dir2/dir/subdir/f
   |
   o  6 "emptydir" files: dir2/dir/subdir/f
   |
   o  5 "movedir" files: dir/a dir/d dir2/a dir2/newfile
   |
   o  4 "movedir1" files: dir1/subdir1/file1 dir1/subdir2/file1
   |
   o  3 "createdir1" files: dir1/subdir1/file1 dir1/subdir2_other/file1
   |
   o  2 "update2 "with" quotes" files: bin bin2 dir/b e
   |
   o  1 "update1" files: a bin c dir/a dir/b
   |
   o  0 "initialize" files: a bin c dir/b dir/d
   
 
 manifest
 
   $ hg manifest
   bin2
   dir1/subdir2/file1
   dir1/subdir2_other/file1
   dir2/a
   dir2/newfile
   dir3/d2/a
   dir6/dir4/a
   dir7-2/c
   dir8-2/a
   dir9-2/b
   e
   large-file
 
 contents
 
   $ cat dir2/a
   a
   a
   $ test -d dir2/dir && echo 'removed dir2/dir is still there!'
   [1]
 
 file move
 
   $ hg log -v -C -r 1 | grep copies
   copies:      dir/a (a)
 
 check directory move
 
   $ hg manifest -r 4
   bin2
   dir/a
   dir/d
   dir1/subdir2/file1
   dir1/subdir2_other/file1
   e
   $ test -d dir1/subdir2 || echo 'new dir1/subdir2 does not exist!'
   $ test -d dir1/subdir1 && echo 'renamed dir1/subdir1 is still there!'
   [1]
   $ hg log -v -C -r 4 | grep copies
   copies:      dir1/subdir2/file1 (dir1/subdir1/file1)
 
 check file remove with directory move
 
   $ hg manifest -r 5
   bin2
   dir1/subdir2/file1
   dir1/subdir2_other/file1
   dir2/a
   dir2/newfile
   e
 
 check file move with directory move
 
   $ hg manifest -r 9
   bin2
   dir1/subdir2/file1
   dir1/subdir2_other/file1
   dir2/a
   dir2/newfile
   dir3/d2/a
   e
 
 check file directory directory move
 
   $ hg manifest -r 11
   bin2
   dir1/subdir2/file1
   dir1/subdir2_other/file1
   dir2/a
   dir2/newfile
   dir3/d2/a
   dir6/dir4/a
   e
 
 check divergent directory moves
 
   $ hg manifest -r 13
   bin2
   dir1/subdir2/file1
   dir1/subdir2_other/file1
   dir2/a
   dir2/newfile
   dir3/d2/a
   dir6/dir4/a
   dir7-2/c
   dir8-2/a
   dir9-2/b
   e
 
 test large file support (> 32kB)
 
   $ md5sum.py large-file
   5d6de8a95c3b6bf9e0ffb808ba5299c1  large-file
 
 check branch closing
 
   $ hg branches -a
   $ hg branches -c
   com.selenic.test              14:* (closed) (glob)
 

tests/test-diff-color.t

@@ -1,416 +1,416 b''
 Setup
 
   $ cat <<EOF >> $HGRCPATH
   > [ui]
   > color = yes
   > formatted = always
   > paginate = never
   > [color]
   > mode = ansi
   > EOF
   $ hg init repo
   $ cd repo
   $ cat > a <<EOF
   > c
   > c
   > a
   > a
   > b
   > a
   > a
   > c
   > c
   > EOF
   $ hg ci -Am adda
   \x1b[0;32madding a\x1b[0m (esc)
   $ cat > a <<EOF
   > c
   > c
   > a
   > a
   > dd
   > a
   > a
   > c
   > c
   > EOF
 
 default context
 
   $ hg diff --nodates
   \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
   \x1b[0;31;1m--- a/a\x1b[0m (esc)
   \x1b[0;32;1m+++ b/a\x1b[0m (esc)
   \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
    c
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m (esc)
    a
    a
    c
 
 trailing whitespace
 
   $ cp a a.orig
   >>> with open('a', 'rb') as f:
   ...     data = f.read()
   >>> with open('a', 'wb') as f:
-  ...     f.write(data.replace(b'dd', b'dd \r'))
+  ...     f.write(data.replace(b'dd', b'dd \r')) and None
   $ hg diff --nodates
   \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
   \x1b[0;31;1m--- a/a\x1b[0m (esc)
   \x1b[0;32;1m+++ b/a\x1b[0m (esc)
   \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
    c
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m\x1b[0;1;41m \x1b[0m\r (esc)
    a
    a
    c
 
   $ mv a.orig a
 
 (check that 'ui.color=yes' match '--color=auto')
 
   $ hg diff --nodates --config ui.formatted=no
   diff -r cf9f4ba66af2 a
   --- a/a
   +++ b/a
   @@ -2,7 +2,7 @@
    c
    a
    a
   -b
   +dd
    a
    a
    c
 
 (check that 'ui.color=no' disable color)
 
   $ hg diff --nodates --config ui.formatted=yes --config ui.color=no
   diff -r cf9f4ba66af2 a
   --- a/a
   +++ b/a
   @@ -2,7 +2,7 @@
    c
    a
    a
   -b
   +dd
    a
    a
    c
 
 (check that 'ui.color=always' force color)
 
   $ hg diff --nodates --config ui.formatted=no --config ui.color=always
   \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
   \x1b[0;31;1m--- a/a\x1b[0m (esc)
   \x1b[0;32;1m+++ b/a\x1b[0m (esc)
   \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
    c
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m (esc)
    a
    a
    c
 
 --unified=2
 
   $ hg diff --nodates -U 2
   \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
   \x1b[0;31;1m--- a/a\x1b[0m (esc)
   \x1b[0;32;1m+++ b/a\x1b[0m (esc)
   \x1b[0;35m@@ -3,5 +3,5 @@\x1b[0m (esc)
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m (esc)
    a
    a
 
 diffstat
 
   $ hg diff --stat
    a |  2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc)
    1 files changed, 1 insertions(+), 1 deletions(-)
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > record =
   > [ui]
   > interactive = true
   > [diff]
   > git = True
   > EOF
 
 #if execbit
 
 record
 
   $ chmod +x a
   $ hg record -m moda a <<EOF
   > y
   > y
   > EOF
   \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
   \x1b[0;36;1mold mode 100644\x1b[0m (esc)
   \x1b[0;36;1mnew mode 100755\x1b[0m (esc)
   1 hunks, 1 lines changed
   \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
   
   \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc)
    c
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m (esc)
    a
    a
    c
   \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
   
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ hg rollback
   repository tip rolled back to revision 0 (undo commit)
   working directory now based on revision 0
 
 qrecord
 
   $ hg qrecord -m moda patch <<EOF
   > y
   > y
   > EOF
   \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
   \x1b[0;36;1mold mode 100644\x1b[0m (esc)
   \x1b[0;36;1mnew mode 100755\x1b[0m (esc)
   1 hunks, 1 lines changed
   \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
   
   \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc)
    c
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m (esc)
    a
    a
    c
   \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
   
 
   $ hg qpop -a
   popping patch
   patch queue now empty
 
 #endif
 
 issue3712: test colorization of subrepo diff
 
   $ hg init sub
   $ echo b > sub/b
   $ hg -R sub commit -Am 'create sub'
   \x1b[0;32madding b\x1b[0m (esc)
   $ echo 'sub = sub' > .hgsub
   $ hg add .hgsub
   $ hg commit -m 'add subrepo sub'
   $ echo aa >> a
   $ echo bb >> sub/b
 
   $ hg diff -S
   \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
   \x1b[0;31;1m--- a/a\x1b[0m (esc)
   \x1b[0;32;1m+++ b/a\x1b[0m (esc)
   \x1b[0;35m@@ -7,3 +7,4 @@\x1b[0m (esc)
    a
    c
    c
   \x1b[0;32m+aa\x1b[0m (esc)
   \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc)
   \x1b[0;31;1m--- a/sub/b\x1b[0m (esc)
   \x1b[0;32;1m+++ b/sub/b\x1b[0m (esc)
   \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
    b
   \x1b[0;32m+bb\x1b[0m (esc)
 
 test tabs
 
   $ cat >> a <<EOF
   > 	one tab
   > 		two tabs
   > end tab	
   > mid	tab
   > 	all		tabs	
   > EOF
   $ hg diff --nodates
   \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
   \x1b[0;31;1m--- a/a\x1b[0m (esc)
   \x1b[0;32;1m+++ b/a\x1b[0m (esc)
   \x1b[0;35m@@ -7,3 +7,9 @@\x1b[0m (esc)
    a
    c
    c
   \x1b[0;32m+aa\x1b[0m (esc)
   \x1b[0;32m+\x1b[0m	\x1b[0;32mone tab\x1b[0m (esc)
   \x1b[0;32m+\x1b[0m		\x1b[0;32mtwo tabs\x1b[0m (esc)
   \x1b[0;32m+end tab\x1b[0m\x1b[0;1;41m	\x1b[0m (esc)
   \x1b[0;32m+mid\x1b[0m	\x1b[0;32mtab\x1b[0m (esc)
   \x1b[0;32m+\x1b[0m	\x1b[0;32mall\x1b[0m		\x1b[0;32mtabs\x1b[0m\x1b[0;1;41m	\x1b[0m (esc)
   $ echo "[color]" >> $HGRCPATH
   $ echo "diff.tab = bold magenta" >> $HGRCPATH
   $ hg diff --nodates
   \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
   \x1b[0;31;1m--- a/a\x1b[0m (esc)
   \x1b[0;32;1m+++ b/a\x1b[0m (esc)
   \x1b[0;35m@@ -7,3 +7,9 @@\x1b[0m (esc)
    a
    c
    c
   \x1b[0;32m+aa\x1b[0m (esc)
   \x1b[0;32m+\x1b[0m\x1b[0;1;35m	\x1b[0m\x1b[0;32mone tab\x1b[0m (esc)
   \x1b[0;32m+\x1b[0m\x1b[0;1;35m		\x1b[0m\x1b[0;32mtwo tabs\x1b[0m (esc)
   \x1b[0;32m+end tab\x1b[0m\x1b[0;1;41m	\x1b[0m (esc)
   \x1b[0;32m+mid\x1b[0m\x1b[0;1;35m	\x1b[0m\x1b[0;32mtab\x1b[0m (esc)
   \x1b[0;32m+\x1b[0m\x1b[0;1;35m	\x1b[0m\x1b[0;32mall\x1b[0m\x1b[0;1;35m		\x1b[0m\x1b[0;32mtabs\x1b[0m\x1b[0;1;41m	\x1b[0m (esc)
 
   $ cd ..
 
 test inline color diff
 
   $ hg init inline
   $ cd inline
   $ cat > file1 << EOF
   > this is the first line
   > this is the second line
   >     third line starts with space
   > + starts with a plus sign
   > 	this one with one tab
   > 		now with full two tabs
   > 	now tabs		everywhere, much fun
   > 
   > this line won't change
   > 
   > two lines are going to
   > be changed into three!
   > 
   > three of those lines will
   > collapse onto one
   > (to see if it works)
   > EOF
   $ hg add file1
   $ hg ci -m 'commit'
 
   $ cat > file1 << EOF
   > that is the first paragraph
   >     this is the second line
   > third line starts with space
   > - starts with a minus sign
   > 	this one with two tab
   > 			now with full three tabs
   > 	now there are tabs		everywhere, much fun
   > 
   > this line won't change
   > 
   > two lines are going to
   > (entirely magically,
   >  assuming this works)
   > be changed into four!
   > 
   > three of those lines have
   > collapsed onto one
   > EOF
   $ hg diff --config diff.word-diff=False --color=debug
   [diff.diffline|diff --git a/file1 b/file1]
   [diff.file_a|--- a/file1]
   [diff.file_b|+++ b/file1]
   [diff.hunk|@@ -1,16 +1,17 @@]
   [diff.deleted|-this is the first line]
   [diff.deleted|-this is the second line]
   [diff.deleted|-    third line starts with space]
   [diff.deleted|-+ starts with a plus sign]
   [diff.deleted|-][diff.tab|	][diff.deleted|this one with one tab]
   [diff.deleted|-][diff.tab|		][diff.deleted|now with full two tabs]
   [diff.deleted|-][diff.tab|	][diff.deleted|now tabs][diff.tab|		][diff.deleted|everywhere, much fun]
   [diff.inserted|+that is the first paragraph]
   [diff.inserted|+    this is the second line]
   [diff.inserted|+third line starts with space]
   [diff.inserted|+- starts with a minus sign]
   [diff.inserted|+][diff.tab|	][diff.inserted|this one with two tab]
   [diff.inserted|+][diff.tab|			][diff.inserted|now with full three tabs]
   [diff.inserted|+][diff.tab|	][diff.inserted|now there are tabs][diff.tab|		][diff.inserted|everywhere, much fun]
    
    this line won't change
    
    two lines are going to
   [diff.deleted|-be changed into three!]
   [diff.inserted|+(entirely magically,]
   [diff.inserted|+ assuming this works)]
   [diff.inserted|+be changed into four!]
    
   [diff.deleted|-three of those lines will]
   [diff.deleted|-collapse onto one]
   [diff.deleted|-(to see if it works)]
   [diff.inserted|+three of those lines have]
   [diff.inserted|+collapsed onto one]
   $ hg diff --config diff.word-diff=True --color=debug
   [diff.diffline|diff --git a/file1 b/file1]
   [diff.file_a|--- a/file1]
   [diff.file_b|+++ b/file1]
   [diff.hunk|@@ -1,16 +1,17 @@]
   [diff.deleted|-][diff.deleted.changed|this][diff.deleted.unchanged| is the first ][diff.deleted.changed|line]
   [diff.deleted|-][diff.deleted.unchanged|this is the second line]
   [diff.deleted|-][diff.deleted.changed|    ][diff.deleted.unchanged|third line starts with space]
   [diff.deleted|-][diff.deleted.changed|+][diff.deleted.unchanged| starts with a ][diff.deleted.changed|plus][diff.deleted.unchanged| sign]
   [diff.deleted|-][diff.tab|	][diff.deleted.unchanged|this one with ][diff.deleted.changed|one][diff.deleted.unchanged| tab]
   [diff.deleted|-][diff.tab|		][diff.deleted.unchanged|now with full ][diff.deleted.changed|two][diff.deleted.unchanged| tabs]
   [diff.deleted|-][diff.tab|	][diff.deleted.unchanged|now ][diff.deleted.unchanged|tabs][diff.tab|		][diff.deleted.unchanged|everywhere, much fun]
   [diff.inserted|+][diff.inserted.changed|that][diff.inserted.unchanged| is the first ][diff.inserted.changed|paragraph]
   [diff.inserted|+][diff.inserted.changed|    ][diff.inserted.unchanged|this is the second line]
   [diff.inserted|+][diff.inserted.unchanged|third line starts with space]
   [diff.inserted|+][diff.inserted.changed|-][diff.inserted.unchanged| starts with a ][diff.inserted.changed|minus][diff.inserted.unchanged| sign]
   [diff.inserted|+][diff.tab|	][diff.inserted.unchanged|this one with ][diff.inserted.changed|two][diff.inserted.unchanged| tab]
   [diff.inserted|+][diff.tab|			][diff.inserted.unchanged|now with full ][diff.inserted.changed|three][diff.inserted.unchanged| tabs]
   [diff.inserted|+][diff.tab|	][diff.inserted.unchanged|now ][diff.inserted.changed|there are ][diff.inserted.unchanged|tabs][diff.tab|		][diff.inserted.unchanged|everywhere, much fun]
    
    this line won't change
    
    two lines are going to
   [diff.deleted|-][diff.deleted.unchanged|be changed into ][diff.deleted.changed|three][diff.deleted.unchanged|!]
   [diff.inserted|+][diff.inserted.changed|(entirely magically,]
   [diff.inserted|+][diff.inserted.changed| assuming this works)]
   [diff.inserted|+][diff.inserted.unchanged|be changed into ][diff.inserted.changed|four][diff.inserted.unchanged|!]
    
   [diff.deleted|-][diff.deleted.unchanged|three of those lines ][diff.deleted.changed|will]
   [diff.deleted|-][diff.deleted.changed|collapse][diff.deleted.unchanged| onto one]
   [diff.deleted|-][diff.deleted.changed|(to see if it works)]
   [diff.inserted|+][diff.inserted.unchanged|three of those lines ][diff.inserted.changed|have]
   [diff.inserted|+][diff.inserted.changed|collapsed][diff.inserted.unchanged| onto one]
 
 multibyte character shouldn't be broken up in word diff:
 
   $ $PYTHON <<'EOF'
   > with open("utf8", "wb") as f:
   >     f.write(b"blah \xe3\x82\xa2 blah\n")
   > EOF
   $ hg ci -Am 'add utf8 char' utf8
   $ $PYTHON <<'EOF'
   > with open("utf8", "wb") as f:
   >     f.write(b"blah \xe3\x82\xa4 blah\n")
   > EOF
   $ hg ci -m 'slightly change utf8 char' utf8
 
   $ hg diff --config diff.word-diff=True --color=debug -c.
   [diff.diffline|diff --git a/utf8 b/utf8]
   [diff.file_a|--- a/utf8]
   [diff.file_b|+++ b/utf8]
   [diff.hunk|@@ -1,1 +1,1 @@]
   [diff.deleted|-][diff.deleted.unchanged|blah ][diff.deleted.changed|\xe3\x82\xa2][diff.deleted.unchanged| blah] (esc)
   [diff.inserted|+][diff.inserted.unchanged|blah ][diff.inserted.changed|\xe3\x82\xa4][diff.inserted.unchanged| blah] (esc)