Mercurial > hg
view tests/test-diff-antipatience.t @ 40602:c36175456350
histedit: import chistedit curses UI from hg-experimental
I don't tend to like curses interfaces, but this gets enough use at
work that it seems like it's worth bringing into core. This is a
minimal import from hg-experimental revision 4c7f33bf5f00, in that
I've done the smallest amount of code movement and editing in order to
import the functionality.
.. feature::
`hg histedit` will now present a curses UI if curses is available
and `ui.interface` or `ui.interface.histedit` is set to `curses`.
Differential Revision: https://phab.mercurial-scm.org/D5146
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 17 Oct 2018 17:15:42 -0400 |
parents | 9ef9884e5d50 |
children |
line wrap: on
line source
#testcases bdiff xdiff #if xdiff #require xdiff $ cat >> $HGRCPATH <<EOF > [experimental] > xdiff = true > EOF #endif Test case that makes use of the weakness of patience diff algorithm $ hg init >>> open('a', 'wb').write(('\n'.join(list('a' + 'x' * 10 + 'u' + 'x' * 30 + 'a\n'))).encode('ascii')) and None $ hg commit -m 1 -A a >>> open('a', 'wb').write(('\n'.join(list('b' + 'x' * 30 + 'u' + 'x' * 10 + 'b\n'))).encode('ascii')) and None #if xdiff $ hg diff diff -r f0aeecb49805 a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +1,4 @@ -a +b x x x @@ -9,7 +9,6 @@ x x x -u x x x @@ -30,6 +29,7 @@ x x x +u x x x @@ -40,5 +40,5 @@ x x x -a +b #else $ hg diff diff -r f0aeecb49805 a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +1,4 @@ -a -x -x -x -x -x -x -x -x -x -x -u +b x x x @@ -40,5 +29,16 @@ x x x -a +u +x +x +x +x +x +x +x +x +x +x +b #endif