This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12440

crecord: add test demonstrating issue when reverting noeol->eol change
ClosedPublic

Authored by spectral on Apr 5 2022, 2:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9a5d09d7f108: crecord: add test demonstrating issue when reverting noeol->eol change
rHGbc7cf68528db: crecord: add test demonstrating issue when reverting noeol->eol change
rHG74444ac3b041: crecord: add test demonstrating issue when reverting noeol->eol change

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Apr 5 2022, 2:26 PM
Alphare accepted this revision.Apr 6 2022, 6:24 AM
This revision is now accepted and ready to land.Apr 6 2022, 6:24 AM
martinvonz added a subscriber: martinvonz.Apr 7 2022, 5:21 PM
martinvonz added inline comments.
tests/test-revert-interactive-curses.t
71

I don't know what happened here but only this line from the whole diff remained in the queued version. I'll fix restore the rest of the changes.

Revision Contents
Changeset List

Diff 32816

tests/test-revert-interactive-curses.t

#require curses #require curses
#testcases committed wdir
Revert interactive tests with the Curses interface Revert interactive tests with the Curses interface
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [ui] > [ui]
> interactive = true > interactive = true
> interface = curses > interface = curses
> [experimental] > [experimental]
> crecordtest = testModeCommands > crecordtest = testModeCommands
> EOF > EOF
TODO: Make a curses version of the other tests from test-revert-interactive.t. TODO: Make a curses version of the other tests from test-revert-interactive.t.
#if committed
$ maybe_commit() {
> hg ci "$@"
> }
$ do_revert() {
> hg revert -ir'.^'
> }
#else
$ maybe_commit() {
> true
> }
$ do_revert() {
> hg revert -i
> }
#endif
When a line without EOL is selected during "revert -i" When a line without EOL is selected during "revert -i"
$ hg init $TESTTMP/revert-i-curses-eol $ hg init $TESTTMP/revert-i-curses-eol
$ cd $TESTTMP/revert-i-curses-eol $ cd $TESTTMP/revert-i-curses-eol
$ echo 0 > a $ echo 0 > a
$ hg ci -qAm 0 $ hg ci -qAm 0
$ printf 1 >> a $ printf 1 >> a
$ hg ci -qAm 1 $ maybe_commit -qAm 1
$ cat a $ cat a
0 0
1 (no-eol) 1 (no-eol)
$ cat <<EOF >testModeCommands $ cat <<EOF >testModeCommands
> c > c
> EOF > EOF
$ hg revert -ir'.^' $ do_revert
reverting a reverting a
$ cat a $ cat a
0 0
When a selected line is reverted to have no EOL When a selected line is reverted to have no EOL
$ hg init $TESTTMP/revert-i-curses-eol2 $ hg init $TESTTMP/revert-i-curses-eol2
$ cd $TESTTMP/revert-i-curses-eol2 $ cd $TESTTMP/revert-i-curses-eol2
$ printf 0 > a $ printf 0 > a
$ hg ci -qAm 0 $ hg ci -qAm 0
$ echo 0 > a $ echo 0 > a
$ hg ci -qAm 1 $ maybe_commit -qAm 1
$ cat a $ cat a
0 0
$ cat <<EOF >testModeCommands $ cat <<EOF >testModeCommands
> c > c
> EOF > EOF
$ hg revert -ir'.^' $ do_revert
reverting a reverting a
$ cat a $ cat a
0 (wdir known-bad-output !)
martinvonzUnsubmitted
Not Done

I don't know what happened here but only this line from the whole diff remained in the queued version. I'll fix restore the rest of the changes.

martinvonz: I don't know what happened here but only this line from the whole diff remained in the queued…
0 (no-eol) 0 (no-eol)