================================================

||  The test for `hg uncommit --interactive`  ||

================================================

Repo Setup

============

  $ . $TESTDIR/testlib/common.sh

  $ cat >> $HGRCPATH <<EOF

  > [ui]

  > interactive = true

  > [extensions]

  > evolve =

  > EOF

  $ glog() {

  >   hg log -G --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@"

  > }

  $ hg init repo

  $ cd repo

  $ touch a

  $ cat >> a << EOF

  > 1

  > 2

  > 3

  > 4

  > 5

  > EOF

  $ hg add a

  $ hg ci -m "The base commit"

Make sure aborting the interactive selection does no magic

----------------------------------------------------------

  $ hg status

  $ hg uncommit -i<<EOF

  > q

  > EOF

  diff --git a/a b/a

  new file mode 100644

  examine changes to 'a'? [Ynesfdaq?] q

  abort: user quit

  [255]

  $ hg status

Make a commit with multiple hunks

---------------------------------

  $ cat > a << EOF

  > -2

  > -1

  > 0

  > 1

  > 2

  > 3

  > foo

  > bar

  > 4

  > 5

  > babar

  > EOF

  $ hg diff

  diff -r 7733902a8d94 a

  --- a/a	Thu Jan 01 00:00:00 1970 +0000

  +++ b/a	Thu Jan 01 00:00:00 1970 +0000

  @@ -1,5 +1,11 @@

  +-2

  +-1

  +0

   1

   2

   3

  +foo

  +bar

   4

   5

  +babar

  $ hg ci -m "another one"

Not selecting anything to uncommit

==================================

  $ hg uncommit -i<<EOF

  > y

  > n

  > n

  > n

  > EOF

  diff --git a/a b/a

  3 hunks, 6 lines changed

  examine changes to 'a'? [Ynesfdaq?] y

  @@ -1,3 +1,6 @@

  +-2

  +-1

  +0

   1

   2

   3

  discard change 1/3 to 'a'? [Ynesfdaq?] n

  @@ -1,5 +4,7 @@

   1

   2

   3

  +foo

  +bar

   4

   5

  discard change 2/3 to 'a'? [Ynesfdaq?] n

  @@ -4,2 +9,3 @@

   4

   5

  +babar

  discard change 3/3 to 'a'? [Ynesfdaq?] n

  abort: nothing selected to uncommit

  [255]

  $ hg status

Uncommit a chunk

================

  $ hg amend --extract -n "note on amend --extract" -i<<EOF

  > y

  > y

  > n

  > n

  > EOF

  diff --git a/a b/a

  3 hunks, 6 lines changed

  examine changes to 'a'? [Ynesfdaq?] y

  @@ -1,3 +1,6 @@

  +-2

  +-1

  +0

   1

   2

   3

  discard change 1/3 to 'a'? [Ynesfdaq?] y

  @@ -1,5 +4,7 @@

   1

   2

   3

  +foo

  +bar

   4

   5

  discard change 2/3 to 'a'? [Ynesfdaq?] n

  @@ -4,2 +9,3 @@

   4

   5

  +babar

  discard change 3/3 to 'a'? [Ynesfdaq?] n

  $ hg obslog

  @  678a59e5ff90 (3) another one

  |

  x  f70fb463d5bf (1) another one

       rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)

         note: note on amend --extract

The unselected part should be in the diff

-----------------------------------------

  $ hg diff

  diff -r 678a59e5ff90 a

  --- a/a	Thu Jan 01 00:00:00 1970 +0000

  +++ b/a	Thu Jan 01 00:00:00 1970 +0000

  @@ -1,3 +1,6 @@

  +-2

  +-1

  +0

   1

   2

   3

The commit should contain the rest of part

------------------------------------------

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

  #      Thu Jan 01 00:00:00 1970 +0000

  # Node ID 678a59e5ff90754d5e94719bd82ad169be773c21

  # Parent  7733902a8d94c789ca81d866bea1893d79442db6

  another one

  diff -r 7733902a8d94 -r 678a59e5ff90 a

  --- a/a	Thu Jan 01 00:00:00 1970 +0000

  +++ b/a	Thu Jan 01 00:00:00 1970 +0000

  @@ -1,5 +1,8 @@

   1

   2

   3

  +foo

  +bar

   4

   5

  +babar

Uncommiting on dirty working directory

======================================

  $ hg status

  M a

  $ hg diff

  diff -r 678a59e5ff90 a

  --- a/a	Thu Jan 01 00:00:00 1970 +0000

  +++ b/a	Thu Jan 01 00:00:00 1970 +0000

  @@ -1,3 +1,6 @@

  +-2

  +-1

  +0

   1

   2

   3

  $ hg uncommit -n "testing uncommit on dirty wdir" -i<<EOF

  > y

  > n

  > y

  > EOF

  diff --git a/a b/a

  2 hunks, 3 lines changed

  examine changes to 'a'? [Ynesfdaq?] y

  @@ -1,5 +1,7 @@

   1

   2

   3

  +foo

  +bar

   4

   5

  discard change 1/2 to 'a'? [Ynesfdaq?] n

  @@ -4,2 +6,3 @@

   4

   5

  +babar

  discard change 2/2 to 'a'? [Ynesfdaq?] y

  patching file a

  Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).

  $ hg diff

  diff -r 46e35360be47 a

  --- a/a	Thu Jan 01 00:00:00 1970 +0000

  +++ b/a	Thu Jan 01 00:00:00 1970 +0000

  @@ -1,3 +1,6 @@

  +-2

  +-1

  +0

   1

   2

   3

  @@ -5,3 +8,4 @@

   bar

   4

   5

  +babar

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

  #      Thu Jan 01 00:00:00 1970 +0000

  # Node ID 46e35360be473bf761bedf3d05de4a68ffd9d9f8

  # Parent  7733902a8d94c789ca81d866bea1893d79442db6

  another one

  diff -r 7733902a8d94 -r 46e35360be47 a

  --- a/a	Thu Jan 01 00:00:00 1970 +0000

  +++ b/a	Thu Jan 01 00:00:00 1970 +0000

  @@ -1,5 +1,7 @@

   1

   2

   3

  +foo

  +bar

   4

   5

Checking the obsolescence history

  $ hg obslog

  @  46e35360be47 (5) another one

  |

  x  678a59e5ff90 (3) another one

  |    rewritten(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)

  |      note: testing uncommit on dirty wdir

  |

  x  f70fb463d5bf (1) another one

       rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)

         note: note on amend --extract

Push the changes back to the commit and more commits for more testing

  $ hg amend

  $ glog

  @  6:905eb2a23ea2@default(draft) another one

  |

  o  0:7733902a8d94@default(draft) The base commit

  $ touch foo

  $ echo "hey" >> foo

  $ hg ci -Am "Added foo"

  adding foo

Testing uncommiting a whole changeset and also for a file addition

==================================================================

  $ hg uncommit -i<<EOF

  > y

  > y

  > EOF

  diff --git a/foo b/foo

  new file mode 100644

  examine changes to 'foo'? [Ynesfdaq?] y

  @@ -0,0 +1,1 @@

  +hey

  discard this change to 'foo'? [Ynesfdaq?] y

  new changeset is empty

  (use 'hg prune .' to remove it)

  $ hg status

  A foo

  $ hg diff

  diff -r 857367499298 foo

  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000

  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

  @@ -0,0 +1,1 @@

  +hey

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

  #      Thu Jan 01 00:00:00 1970 +0000

  # Node ID 857367499298e999b5841bb01df65f73088b5d3b

  # Parent  905eb2a23ea2d92073419d0e19165b90d36ea223

  Added foo

  $ hg amend

Testing to uncommit removed files completely

============================================

  $ hg rm a

  $ hg ci -m "Removed a"

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

  #      Thu Jan 01 00:00:00 1970 +0000

  # Node ID 219cfe20964e93f8bb9bd82ceaa54d3b776046db

  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31

  Removed a

  diff -r 42cc15efbec2 -r 219cfe20964e a

  --- a/a	Thu Jan 01 00:00:00 1970 +0000

  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

  @@ -1,11 +0,0 @@

  --2

  --1

  -0

  -1

  -2

  -3

  -foo

  -bar

  -4

  -5

  -babar

Not examining the file

----------------------

  $ hg uncommit -i<<EOF

  > n

  > EOF

  diff --git a/a b/a

  deleted file mode 100644

  examine changes to 'a'? [Ynesfdaq?] n

  abort: nothing selected to uncommit

  [255]

Examining the file

------------------

XXX: there is a bug in interactive selection as it is not letting to examine the

file. Tried with curses too. In the curses UI, if you just unselect the hunks

and the not file mod thing at the top, it will show the same "nothing unselected

to uncommit" message which is a bug in interactive selection.

  $ hg uncommit -i<<EOF

  > y

  > EOF

  diff --git a/a b/a

  deleted file mode 100644

  examine changes to 'a'? [Ynesfdaq?] y

  new changeset is empty

  (use 'hg prune .' to remove it)