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

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

  (enter ? for help) [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'?

  (enter ? for help) [Ynesfdaq?] y

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

  +-2

  +-1

  +0

   1

   2

   3

  discard change 1/3 to 'a'?

  (enter ? for help) [Ynesfdaq?] n

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

   1

   2

   3

  +foo

  +bar

   4

   5

  discard change 2/3 to 'a'?

  (enter ? for help) [Ynesfdaq?] n

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

   4

   5

  +babar

  discard change 3/3 to 'a'?

  (enter ? for help) [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'?

  (enter ? for help) [Ynesfdaq?] y

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

  +-2

  +-1

  +0

   1

   2

   3

  discard change 1/3 to 'a'?

  (enter ? for help) [Ynesfdaq?] y

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

   1

   2

   3

  +foo

  +bar

   4

   5

  discard change 2/3 to 'a'?

  (enter ? for help) [Ynesfdaq?] n

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

   4

   5

  +babar

  discard change 3/3 to 'a'?

  (enter ? for help) [Ynesfdaq?] n

  $ hg debugobsolete

  e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'}

  f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'}

  $ hg obslog

  @  678a59e5ff90 (3) another one

  |

  x  f70fb463d5bf (1) another one

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

  (enter ? for help) [Ynesfdaq?] y

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

   1

   2

   3

  +foo

  +bar

   4

   5

  discard change 1/2 to 'a'?

  (enter ? for help) [Ynesfdaq?] n

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

   4

   5

  +babar

  discard change 2/2 to 'a'?

  (enter ? for help) [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 debugobsolete

  e9635f4beaf11f64a07ccc74684092b144c53d89 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'}

  f70fb463d5bf9f0ffd38f105521d96e9f2591bc1 678a59e5ff90754d5e94719bd82ad169be773c21 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'note on amend --extract', 'operation': 'uncommit', 'user': 'test'}

  7ca9935a62f11b39b60c7fb8861377c7d45b3e99 0 {7733902a8d94c789ca81d866bea1893d79442db6} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'uncommit', 'user': 'test'}

  678a59e5ff90754d5e94719bd82ad169be773c21 46e35360be473bf761bedf3d05de4a68ffd9d9f8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'testing uncommit on dirty wdir', 'operation': 'uncommit', 'user': 'test'}

  $ hg obslog

  @  46e35360be47 (5) another one

  |

  x  678a59e5ff90 (3) another one

  |

  x  f70fb463d5bf (1) another one

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

  (enter ? for help) [Ynesfdaq?] y

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

  +hey

  discard this change to 'foo'?

  (enter ? for help) [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