upstream/mercurial-mirror Files · tests/test-diff-color.t

patch: implement a new worddiff algorithm...

patch: implement a new worddiff algorithm The previous worddiff algorithm has many problems. The major problem is it does a "similarity check" that selects a subset of matched lines to do inline diffs. It is a bad idea because: - The "similarity check" is non-obvious to users. For example, a simple change from "long long x" to "int64_t x" will fail the similarity check and won't be diff-ed as expected. - Selecting "lines" to diff won't work as people expect if there are line wrapping changes. - It has a sad time complexity if lines do not match, could be O(N^2)-ish. There are other problems in implementation details. - Lines can match across distant hunks (if the next hunk does not have "-" lines). - "difflib" is slow. The solution would be removing the "similarity check", and just diff all words in a same hunk. So no content will be missed and everything will be diff-ed as expected. This is similar to what code review tool like Phabricator does. This diff implements the word diff algorithm as described above. It also avoids difflib to be faster. Note about colors: To be consistent, "changed inserted" parts and "purely insertion blocks" should have a same color, since they do not exist in the previous version. Instead of highlighting differences, this patch chooses to dim common parts. This is also more consistent with Phabricator or GitHub webpage. That said, the labels are defined in a way that people can still highlight changed parts and leave purely inserted/deleted hunks use the "non-highlighted" color. As one example, running: hg log -pr mercurial/commands.py \ --config experimental.worddiff=1 --color=debug --config diff.unified=0 The previous algorithm outputs: [diff.file_a|--- a/mercurial/commands.py Fri Mar 09 15:53:41 2018 +0100] [diff.file_b|+++ b/mercurial/commands.py Sat Mar 10 12:33:19 2018 +0530] [diff.hunk|@@ -2039,1 +2039,4 @@] [diff.deleted|-][diff.deleted.highlight|@command('^forget',][diff.deleted| ][diff.deleted.highlight|walkopts,][diff.deleted| _('[OPTION]... FILE...'), inferrepo=True)] [diff.inserted|+@command(] [diff.inserted|+ '^forget',] [diff.inserted|+ walkopts + dryrunopts,] [diff.inserted|+ ][diff.inserted.highlight| ][diff.inserted| _('[OPTION]... FILE...'), inferrepo=True)] [diff.hunk|@@ -2074,1 +2077,3 @@] [diff.deleted|- rejected = cmdutil.forget(ui, repo, m, prefix="",][diff.deleted.highlight| explicitonly=False)[0]] [diff.inserted|+ dryrun = opts.get(r'dry_run')] [diff.inserted|+ rejected = cmdutil.forget(ui, repo, m, prefix="",] [diff.inserted|+ explicitonly=False, dryrun=dryrun)[0]] The new algorithm outputs: [diff.file_a|--- a/mercurial/commands.py Fri Mar 09 15:53:41 2018 +0100] [diff.file_b|+++ b/mercurial/commands.py Sat Mar 10 12:33:19 2018 +0530] [diff.hunk|@@ -2039,1 +2039,4 @@] [diff.deleted|-][diff.deleted.unchanged|@command(][diff.deleted.unchanged|'^forget',][diff.deleted.unchanged| ][diff.deleted.changed|walkopts][diff.deleted.unchanged|,][diff.deleted.changed| ][diff.deleted.unchanged|_('[OPTION]... FILE...'), inferrepo=True)] [diff.inserted|+][diff.inserted.unchanged|@command(] [diff.inserted|+][diff.inserted.changed| ][diff.inserted.unchanged|'^forget',] [diff.inserted|+][diff.inserted.changed| walkopts][diff.inserted.unchanged| ][diff.inserted.changed|+ dryrunopts][diff.inserted.unchanged|,] [diff.inserted|+][diff.inserted.changed| ][diff.inserted.unchanged|_('[OPTION]... FILE...'), inferrepo=True)] [diff.hunk|@@ -2074,1 +2077,3 @@] [diff.deleted|-][diff.deleted.unchanged| rejected = cmdutil.forget(ui, repo, m, prefix="",][diff.deleted.changed| ][diff.deleted.unchanged|explicitonly=False][diff.deleted.unchanged|)[0]] [diff.inserted|+][diff.inserted.changed| dryrun = opts.get(r'dry_run')] [diff.inserted|+][diff.inserted.unchanged| rejected = cmdutil.forget(ui, repo, m, prefix="",] [diff.inserted|+][diff.inserted.changed| ][diff.inserted.unchanged|explicitonly=False][diff.inserted.changed|, dryrun=dryrun][diff.inserted.unchanged|)[0]] Practically, when diffing a 8k line change, the time spent on worddiff reduces from 4 seconds to 0.14 seconds. Differential Revision: https://phab.mercurial-scm.org/D3212

Jun Wu - - Load All Authors

File last commit:

r37750:35632d39 default


                r37750:35632d39

default

Download file

             test-diff-color.t
        
                    393 lines
            
             | 10.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-color.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
      Setup

        Yuya Nishihara
    
tests: write hgrc of more than two lines by using shell heredoc...

              r23172
            
        $ cat <<EOF >> $HGRCPATH

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        > [ui]

        Pierre-Yves David
    
color: special case 'always' in 'ui.color'...

              r32104
            
        > color = yes

        Pierre-Yves David
    
color: turn 'ui.color' into a boolean (auto or off)...

              r32103
            
        > formatted = always

        Matt Harbison
    
test-diff-color: disable pager for expected output on Windows (issue5555)...

              r32122
            
        > paginate = never

        Yuya Nishihara
    
tests: write hgrc of more than two lines by using shell heredoc...

              r23172
            
        > [color]

        > mode = ansi

        > EOF

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        $ hg init repo

        $ cd repo

        $ cat > a <<EOF

        > c

        > c

        > a

        > a

        > b

        > a

        > a

        > c

        > c

        > EOF

        $ hg ci -Am adda

        adding a

        $ cat > a <<EOF

        > c

        > c

        > a

        > a

        > dd

        > a

        > a

        > c

        > c

        > EOF

      default context

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        $ hg diff --nodates

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \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)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         c

         a

         a

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;31m-b\x1b[0m (esc)

        \x1b[0;32m+dd\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

         c

        Pierre-Yves David
    
color: turn 'ui.color' into a boolean (auto or off)...

              r32103
            
      (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

        Pierre-Yves David
    
color: special case 'always' in 'ui.color'...

              r32104
            
      (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

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
      --unified=2

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        $ hg diff --nodates -U 2

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \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)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;31m-b\x1b[0m (esc)

        \x1b[0;32m+dd\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

      diffstat

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        $ hg diff --stat

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
         a |  2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         1 files changed, 1 insertions(+), 1 deletions(-)

        Yuya Nishihara
    
tests: write hgrc of more than two lines by using shell heredoc...

              r23172
            
        $ cat <<EOF >> $HGRCPATH

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        > [extensions]

        Yuya Nishihara
    
tests: write hgrc of more than two lines by using shell heredoc...

              r23172
            
        > record =

        > [ui]

        > interactive = true

        > [diff]

        > git = True

        > EOF

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        Mads Kiilerich
    
tests: convert some 'hghave execbit' to #if...

              r16899
            
      #if execbit

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
      record

        Mads Kiilerich
    
tests: use 'hghave execbit' for tests that manipulate x bit in file system

              r15442
            
        $ chmod +x a

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        $ hg record -m moda a <<EOF

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        > y

        > y

        > EOF

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \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)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        1 hunks, 1 lines changed

        Mads Kiilerich
    
ui: show prompt choice if input is not a tty but is forced to be interactive...

              r22589
            
        \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)

        timeless
    
record: turn on showfunc...

              r27411
            
        \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         c

         a

         a

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;31m-b\x1b[0m (esc)

        \x1b[0;32m+dd\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

         c

        Mads Kiilerich
    
ui: show prompt choice if input is not a tty but is forced to be interactive...

              r22589
            
        \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)

        Mads Kiilerich
    
tests: cleanup of echo statements left over from test conversion

              r15243
            
        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg rollback

        Gilles Moris
    
rollback: clarifies the message about the reverted state (issue2628)...

              r13446
            
        repository tip rolled back to revision 0 (undo commit)

        working directory now based on revision 0

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
      qrecord

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        $ hg qrecord -m moda patch <<EOF

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        > y

        > y

        > EOF

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \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)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
        1 hunks, 1 lines changed

        Mads Kiilerich
    
ui: show prompt choice if input is not a tty but is forced to be interactive...

              r22589
            
        \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)

        timeless
    
record: turn on showfunc...

              r27411
            
        \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         c

         a

         a

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;31m-b\x1b[0m (esc)

        \x1b[0;32m+dd\x1b[0m (esc)

        Matt Mackall
    
tests: unify test-diff-color

              r12415
            
         a

         a

         c

        Mads Kiilerich
    
ui: show prompt choice if input is not a tty but is forced to be interactive...

              r22589
            
        \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)

        Mads Kiilerich
    
tests: convert some 'hghave execbit' to #if...

              r16899
            
        FUJIWARA Katsunori
    
subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...

              r18006
            
        $ hg qpop -a

        popping patch

        patch queue now empty

        Mads Kiilerich
    
tests: convert some 'hghave execbit' to #if...

              r16899
            
      #endif

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        FUJIWARA Katsunori
    
subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...

              r18006
            
      issue3712: test colorization of subrepo diff

        $ hg init sub

        $ echo b > sub/b

        $ hg -R sub commit -Am 'create sub'

        adding b

        $ echo 'sub = sub' > .hgsub

        $ hg add .hgsub

        $ hg commit -m 'add subrepo sub'

        $ echo aa >> a

        $ echo bb >> sub/b

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        $ hg diff -S

        FUJIWARA Katsunori
    
subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...

              r18006
            
        \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)

        Simon Heimberg
    
tests: remove glob lines which unnecessary match / for \ on windows...

              r18720
            
        \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc)

        FUJIWARA Katsunori
    
subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...

              r18006
            
        \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)

        Jordi Gutiérrez Hermoso
    
patch: enable diff.tab markup for the color extension...

              r22460
            
      test tabs

        $ cat >> a <<EOF

        > 	one tab

        > 		two tabs

        > end tab	

        > mid	tab

        > 	all		tabs	

        > EOF

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        $ hg diff --nodates

        Jordi Gutiérrez Hermoso
    
patch: enable diff.tab markup for the color extension...

              r22460
            
        \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

        Pierre-Yves David
    
color: add a 'ui.color' option to control color behavior...

              r31110
            
        $ hg diff --nodates

        Jordi Gutiérrez Hermoso
    
patch: enable diff.tab markup for the color extension...

              r22460
            
        \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)

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

        Matthieu Laneuville
    
patch: add within-line color diff capacity...

              r35278
            
      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

        Matthieu Laneuville
    
patch: move part of tabsplitter logic in _inlinediff...

              r35329
            
        > 	this one with one tab

        > 		now with full two tabs

        > 	now tabs		everywhere, much fun

        Matthieu Laneuville
    
patch: add within-line color diff capacity...

              r35278
            
        > 

        > 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'

        Matthieu Laneuville
    
patch: move part of tabsplitter logic in _inlinediff...

              r35329
            
        Matthieu Laneuville
    
patch: add within-line color diff capacity...

              r35278
            
        $ cat > file1 << EOF

        > that is the first paragraph

        >     this is the second line

        > third line starts with space

        > - starts with a minus sign

        Matthieu Laneuville
    
patch: move part of tabsplitter logic in _inlinediff...

              r35329
            
        > 	this one with two tab

        > 			now with full three tabs

        > 	now there are tabs		everywhere, much fun

        Matthieu Laneuville
    
patch: add within-line color diff capacity...

              r35278
            
        > 

        > 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 experimental.worddiff=False --color=debug

        [diff.diffline|diff --git a/file1 b/file1]

        [diff.file_a|--- a/file1]

        [diff.file_b|+++ b/file1]

        Matthieu Laneuville
    
patch: move part of tabsplitter logic in _inlinediff...

              r35329
            
        [diff.hunk|@@ -1,16 +1,17 @@]

        Matthieu Laneuville
    
patch: add within-line color diff capacity...

              r35278
            
        [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]

        Matthieu Laneuville
    
patch: move part of tabsplitter logic in _inlinediff...

              r35329
            
        [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]

        Matthieu Laneuville
    
patch: add within-line color diff capacity...

              r35278
            
        [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]

        Matthieu Laneuville
    
patch: move part of tabsplitter logic in _inlinediff...

              r35329
            
        [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]

        Matthieu Laneuville
    
patch: add within-line color diff capacity...

              r35278
            
         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 experimental.worddiff=True --color=debug

        [diff.diffline|diff --git a/file1 b/file1]

        [diff.file_a|--- a/file1]

        [diff.file_b|+++ b/file1]

        Matthieu Laneuville
    
patch: move part of tabsplitter logic in _inlinediff...

              r35329
            
        [diff.hunk|@@ -1,16 +1,17 @@]

        Jun Wu
    
patch: implement a new worddiff algorithm...

              r37750
            
        [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]

        Matthieu Laneuville
    
patch: add within-line color diff capacity...

              r35278
            
         this line won't change

         two lines are going to

        Jun Wu
    
patch: implement a new worddiff algorithm...

              r37750
            
        [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|!]

        Matthieu Laneuville
    
patch: add within-line color diff capacity...

              r35278
            
        Jun Wu
    
patch: implement a new worddiff algorithm...

              r37750
            
        [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]

        Yuya Nishihara
    
patch: do not break up multibyte character when highlighting word...

              r35384
            
      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

        Jun Wu
    
patch: buffer lines for a same hunk...

              r37749
            
        Yuya Nishihara
    
patch: do not break up multibyte character when highlighting word...

              r35384
            
        $ hg diff --config experimental.worddiff=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 @@]

        Jun Wu
    
patch: implement a new worddiff algorithm...

              r37750
            
        [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)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Matt Mackall tests: unify test-diff-color	r12415	Setup

Yuya Nishihara tests: write hgrc of more than two lines by using shell heredoc...	r23172	$ cat <<EOF >> $HGRCPATH
Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	> [ui]
Pierre-Yves David color: special case 'always' in 'ui.color'...	r32104	> color = yes
Pierre-Yves David color: turn 'ui.color' into a boolean (auto or off)...	r32103	> formatted = always
Matt Harbison test-diff-color: disable pager for expected output on Windows (issue5555)...	r32122	> paginate = never
Yuya Nishihara tests: write hgrc of more than two lines by using shell heredoc...	r23172	> [color]
		> mode = ansi
		> EOF
Matt Mackall tests: unify test-diff-color	r12415	$ hg init repo
		$ cd repo
		$ cat > a <<EOF
		> c
		> c
		> a
		> a
		> b
		> a
		> a
		> c
		> c
		> EOF
		$ hg ci -Am adda
		adding a
		$ cat > a <<EOF
		> c
		> c
		> a
		> a
		> dd
		> a
		> a
		> c
		> c
		> EOF

		default context

Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	$ hg diff --nodates
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\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)
Matt Mackall tests: unify test-diff-color	r12415	c
		a
		a
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;31m-b\x1b[0m (esc)
		\x1b[0;32m+dd\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	a
		a
		c

Pierre-Yves David color: turn 'ui.color' into a boolean (auto or off)...	r32103	(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

Pierre-Yves David color: special case 'always' in 'ui.color'...	r32104	(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

Matt Mackall tests: unify test-diff-color	r12415	--unified=2

Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	$ hg diff --nodates -U 2
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\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)
Matt Mackall tests: unify test-diff-color	r12415	a
		a
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;31m-b\x1b[0m (esc)
		\x1b[0;32m+dd\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	a
		a

		diffstat

Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	$ hg diff --stat
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	a \| 2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	1 files changed, 1 insertions(+), 1 deletions(-)
Yuya Nishihara tests: write hgrc of more than two lines by using shell heredoc...	r23172	$ cat <<EOF >> $HGRCPATH
Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	> [extensions]
Yuya Nishihara tests: write hgrc of more than two lines by using shell heredoc...	r23172	> record =
		> [ui]
		> interactive = true
		> [diff]
		> git = True
		> EOF
Matt Mackall tests: unify test-diff-color	r12415
Mads Kiilerich tests: convert some 'hghave execbit' to #if...	r16899	#if execbit

Matt Mackall tests: unify test-diff-color	r12415	record

Mads Kiilerich tests: use 'hghave execbit' for tests that manipulate x bit in file system	r15442	$ chmod +x a
Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	$ hg record -m moda a <<EOF
Matt Mackall tests: unify test-diff-color	r12415	> y
		> y
		> EOF
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\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)
Matt Mackall tests: unify test-diff-color	r12415	1 hunks, 1 lines changed
Mads Kiilerich ui: show prompt choice if input is not a tty but is forced to be interactive...	r22589	\x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)

timeless record: turn on showfunc...	r27411	\x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	c
		a
		a
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;31m-b\x1b[0m (esc)
		\x1b[0;32m+dd\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	a
		a
		c
Mads Kiilerich ui: show prompt choice if input is not a tty but is forced to be interactive...	r22589	\x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)

Mads Kiilerich tests: cleanup of echo statements left over from test conversion	r15243
Matt Mackall tests: unify test-diff-color	r12415	$ echo "[extensions]" >> $HGRCPATH
		$ echo "mq=" >> $HGRCPATH
		$ hg rollback
Gilles Moris rollback: clarifies the message about the reverted state (issue2628)...	r13446	repository tip rolled back to revision 0 (undo commit)
		working directory now based on revision 0
Matt Mackall tests: unify test-diff-color	r12415
		qrecord

Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	$ hg qrecord -m moda patch <<EOF
Matt Mackall tests: unify test-diff-color	r12415	> y
		> y
		> EOF
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\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)
Matt Mackall tests: unify test-diff-color	r12415	1 hunks, 1 lines changed
Mads Kiilerich ui: show prompt choice if input is not a tty but is forced to be interactive...	r22589	\x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)

timeless record: turn on showfunc...	r27411	\x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	c
		a
		a
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;31m-b\x1b[0m (esc)
		\x1b[0;32m+dd\x1b[0m (esc)
Matt Mackall tests: unify test-diff-color	r12415	a
		a
		c
Mads Kiilerich ui: show prompt choice if input is not a tty but is forced to be interactive...	r22589	\x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)

Mads Kiilerich tests: convert some 'hghave execbit' to #if...	r16899
FUJIWARA Katsunori subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...	r18006	$ hg qpop -a
		popping patch
		patch queue now empty

Mads Kiilerich tests: convert some 'hghave execbit' to #if...	r16899	#endif
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
FUJIWARA Katsunori subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...	r18006	issue3712: test colorization of subrepo diff

		$ hg init sub
		$ echo b > sub/b
		$ hg -R sub commit -Am 'create sub'
		adding b
		$ echo 'sub = sub' > .hgsub
		$ hg add .hgsub
		$ hg commit -m 'add subrepo sub'
		$ echo aa >> a
		$ echo bb >> sub/b

Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	$ hg diff -S
FUJIWARA Katsunori subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...	r18006	\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)
Simon Heimberg tests: remove glob lines which unnecessary match / for \ on windows...	r18720	\x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc)
FUJIWARA Katsunori subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...	r18006	\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)

Jordi Gutiérrez Hermoso patch: enable diff.tab markup for the color extension...	r22460	test tabs

		$ cat >> a <<EOF
		> one tab
		> two tabs
		> end tab
		> mid tab
		> all tabs
		> EOF
Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	$ hg diff --nodates
Jordi Gutiérrez Hermoso patch: enable diff.tab markup for the color extension...	r22460	\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
Pierre-Yves David color: add a 'ui.color' option to control color behavior...	r31110	$ hg diff --nodates
Jordi Gutiérrez Hermoso patch: enable diff.tab markup for the color extension...	r22460	\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)

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..
Matthieu Laneuville patch: add within-line color diff capacity...	r35278
		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
Matthieu Laneuville patch: move part of tabsplitter logic in _inlinediff...	r35329	> this one with one tab
		> now with full two tabs
		> now tabs everywhere, much fun
Matthieu Laneuville patch: add within-line color diff capacity...	r35278	>
		> 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'
Matthieu Laneuville patch: move part of tabsplitter logic in _inlinediff...	r35329
Matthieu Laneuville patch: add within-line color diff capacity...	r35278	$ cat > file1 << EOF
		> that is the first paragraph
		> this is the second line
		> third line starts with space
		> - starts with a minus sign
Matthieu Laneuville patch: move part of tabsplitter logic in _inlinediff...	r35329	> this one with two tab
		> now with full three tabs
		> now there are tabs everywhere, much fun
Matthieu Laneuville patch: add within-line color diff capacity...	r35278	>
		> 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 experimental.worddiff=False --color=debug
		[diff.diffline\|diff --git a/file1 b/file1]
		[diff.file_a\|--- a/file1]
		[diff.file_b\|+++ b/file1]
Matthieu Laneuville patch: move part of tabsplitter logic in _inlinediff...	r35329	[diff.hunk\|@@ -1,16 +1,17 @@]
Matthieu Laneuville patch: add within-line color diff capacity...	r35278	[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]
Matthieu Laneuville patch: move part of tabsplitter logic in _inlinediff...	r35329	[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]
Matthieu Laneuville patch: add within-line color diff capacity...	r35278	[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]
Matthieu Laneuville patch: move part of tabsplitter logic in _inlinediff...	r35329	[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]
Matthieu Laneuville patch: add within-line color diff capacity...	r35278
		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 experimental.worddiff=True --color=debug
		[diff.diffline\|diff --git a/file1 b/file1]
		[diff.file_a\|--- a/file1]
		[diff.file_b\|+++ b/file1]
Matthieu Laneuville patch: move part of tabsplitter logic in _inlinediff...	r35329	[diff.hunk\|@@ -1,16 +1,17 @@]
Jun Wu patch: implement a new worddiff algorithm...	r37750	[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]
Matthieu Laneuville patch: add within-line color diff capacity...	r35278
		this line won't change

		two lines are going to
Jun Wu patch: implement a new worddiff algorithm...	r37750	[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\|!]
Matthieu Laneuville patch: add within-line color diff capacity...	r35278
Jun Wu patch: implement a new worddiff algorithm...	r37750	[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]
Yuya Nishihara patch: do not break up multibyte character when highlighting word...	r35384
		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
Jun Wu patch: buffer lines for a same hunk...	r37749
Yuya Nishihara patch: do not break up multibyte character when highlighting word...	r35384	$ hg diff --config experimental.worddiff=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 @@]
Jun Wu patch: implement a new worddiff algorithm...	r37750	[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)