Mercurial > public > mercurial-scm > hg
diff tests/test-diff-color.t @ 37731:5471348921c1
patch: buffer lines for a same hunk
Instead of yielding tokens directly, buffer them if they belong to a same
hunk. This makes it easier for the upcoming new worddiff algorithm to only
focus on the diff hunk, instead of having to worry about other contents.
This breaks how the existing experimental worddiff algorithm works, so the
algorithm was removed, and related tests are disabled for now. The next patch
will add a new worddiff algorithm.
Differential Revision: https://phab.mercurial-scm.org/D3211
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Mon, 19 Mar 2018 04:28:30 -0700 |
| parents | 82c3762349ac |
| children | 35632d392279 |
line wrap: on
line diff
--- a/tests/test-diff-color.t Mon Mar 19 04:28:29 2018 -0700 +++ b/tests/test-diff-color.t Mon Mar 19 04:28:30 2018 -0700 @@ -337,6 +337,7 @@ [diff.deleted|-(to see if it works)] [diff.inserted|+three of those lines have] [diff.inserted|+collapsed onto one] +#if false $ hg diff --config experimental.worddiff=True --color=debug [diff.diffline|diff --git a/file1 b/file1] [diff.file_a|--- a/file1] @@ -370,6 +371,7 @@ [diff.deleted|-(to see if it works)] [diff.inserted|+three of those lines ][diff.inserted.highlight|have] [diff.inserted|+][diff.inserted.highlight|collapsed][diff.inserted| onto one] +#endif multibyte character shouldn't be broken up in word diff: @@ -383,6 +385,8 @@ > f.write(b"blah \xe3\x82\xa4 blah\n") > EOF $ hg ci -m 'slightly change utf8 char' utf8 + +#if false $ hg diff --config experimental.worddiff=True --color=debug -c. [diff.diffline|diff --git a/utf8 b/utf8] [diff.file_a|--- a/utf8] @@ -390,3 +394,4 @@ [diff.hunk|@@ -1,1 +1,1 @@] [diff.deleted|-blah ][diff.deleted.highlight|\xe3\x82\xa2][diff.deleted| blah] (esc) [diff.inserted|+blah ][diff.inserted.highlight|\xe3\x82\xa4][diff.inserted| blah] (esc) +#endif