** Test for the `--patch` flag for `hg amend` command **

Setup

  $ cat >> $HGRCPATH << EOF

  > [alias]

  > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"

  > [diff]

  > git = 1

  > [extensions]

  > EOF

  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH

Reposetup

  $ hg init repo

  $ cd repo

  $ echo foo > a

  $ hg ci -Aqm "added a"

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID f7ad4196431346de3c33c52e75374fba45e04313

  # Parent  0000000000000000000000000000000000000000

  added a

  diff --git a/a b/a

  new file mode 100644

  --- /dev/null

  +++ b/a

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

  +foo

Testing of just changing the diff, not the patch metadata

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

Testing the normal case

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

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > cat > \$1 <<ENDOF

  > # HG changeset patch

  > # User test

  > # Date 0 0

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

  > # Node ID f7ad4196431346de3c33c52e75374fba45e04313

  > # Parent  0000000000000000000000000000000000000000

  > added a

  > diff --git a/a b/a

  > new file mode 100644

  > --- /dev/null

  > +++ b/a

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

  > +Gello

  > ENDOF

  > EOF

  $ HGEDITOR="sh ./editor.sh" hg amend --patch

Making sure the amended commit is correct

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID af624b221c0c0bec5d74e2650180dd3eddcb7c42

  # Parent  0000000000000000000000000000000000000000

  added a

  diff --git a/a b/a

  new file mode 100644

  --- /dev/null

  +++ b/a

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

  +Gello

  $ hg glog

  @  1:af624b221c0c added a

      () draft

Obsolsence history is fine

  $ hg debugobsolete

  f7ad4196431346de3c33c52e75374fba45e04313 af624b221c0c0bec5d74e2650180dd3eddcb7c42 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}

  $ hg obslog -p -r .

  @  af624b221c0c (1) added a

  |    amended(content) from f7ad41964313 using amend by test (Thu Jan 01 00:00:00 1970 +0000)

  |      diff --git a/a b/a

  |      --- a/a

  |      +++ b/a

  |      @@ -1,1 +1,1 @@

  |      -foo

  |      +Gello

  |

  |

  x  f7ad41964313 (0) added a

Diff and status are good too

  $ hg diff

  $ hg status

  ? editor.sh

  $ cat a

  Gello

Dirstate parents should be correctly set

  $ hg parents

  changeset:   1:af624b221c0c

  tag:         tip

  parent:      -1:000000000000

  user:        test

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

  summary:     added a

Trying to amend with a wrong patch

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

Having context which was is not present

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > cat > \$1 <<ENDOF

  > # HG changeset patch

  > # User test

  > # Date 0 0

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

  > # Node ID c6ba250efbf73e671f2ca24b79db2c178ccbfff9

  > # Parent  0000000000000000000000000000000000000000

  > added a

  > diff --git a/a b/a

  > new file mode 100644

  > --- /dev/null

  > +++ b/a

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

  > I was not there before!

  > +Gello

  > ENDOF

  > EOF

  $ HGEDITOR="sh ./editor.sh" hg amend --patch

  failed to apply edited patch: bad hunk #1 @@ -0,0 +1,1 @@

   (1 0 1 1)

  try to fix the patch (yn)? y

  abort: patch unchanged

  [255]

Having deletions which dont exists

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > cat > \$1 <<ENDOF

  > # HG changeset patch

  > # User test

  > # Date 0 0

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

  > # Node ID af624b221c0c0bec5d74e2650180dd3eddcb7c42

  > # Parent  0000000000000000000000000000000000000000

  > added a

  > diff --git a/a b/a

  > new file mode 100644

  > --- /dev/null

  > +++ b/a

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

  > -I was not deleted before!

  > +Gello

  > ENDOF

  > EOF

  $ HGEDITOR="sh ./editor.sh" hg amend --patch

  failed to apply edited patch: bad hunk #1 @@ -0,0 +1,1 @@

   (1 0 1 1)

  try to fix the patch (yn)? y

  abort: patch unchanged

  [255]

Changing the file mode using amend --patch

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

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > cat > \$1 <<ENDOF

  > # HG changeset patch

  > # User test

  > # Date 0 0

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

  > # Node ID af624b221c0c0bec5d74e2650180dd3eddcb7c42

  > # Parent  0000000000000000000000000000000000000000

  > added a

  > diff --git a/a b/a

  > new file mode 100755

  > --- /dev/null

  > +++ b/a

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

  > +Gello

  > ENDOF

  > EOF

  $ HGEDITOR="sh ./editor.sh" hg amend --patch

  $ hg exp --git

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID 3a99e4b7ac73da799e20ae56914e3dd5b1a22d4d

  # Parent  0000000000000000000000000000000000000000

  added a

  diff --git a/a b/a

  new file mode 100755

  --- /dev/null

  +++ b/a

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

  +Gello

Changing the file using amend --patch

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

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > cat > \$1 <<ENDOF

  > # HG changeset patch

  > # User test

  > # Date 0 0

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

  > # Node ID 3a99e4b7ac73da799e20ae56914e3dd5b1a22d4d

  > # Parent  0000000000000000000000000000000000000000

  > added a

  > diff --git a/changedfile b/changedfile

  > new file mode 100755

  > --- /dev/null

  > +++ b/changedfile

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

  > +Gello

  > ENDOF

  > EOF

  $ HGEDITOR="sh ./editor.sh" hg amend --patch

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID fc57c20be380f2878f4db139dad66d6cfb42ec62

  # Parent  0000000000000000000000000000000000000000

  added a

  diff --git a/changedfile b/changedfile

  new file mode 100755

  --- /dev/null

  +++ b/changedfile

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

  +Gello

  $ hg status

  ? editor.sh

  $ ls -A

  .hg

  changedfile

  editor.sh

Handling both deletions and additions

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

  $ echo foobar > changedfile

  $ hg ci -m "foobar to changedfile"

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID 7969f70ffb81c3a6eee2d4f2f7032b694ce05349

  # Parent  fc57c20be380f2878f4db139dad66d6cfb42ec62

  foobar to changedfile

  diff --git a/changedfile b/changedfile

  --- a/changedfile

  +++ b/changedfile

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

  -Gello

  +foobar

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > cat > \$1 <<ENDOF

  > # HG changeset patch

  > # User test

  > # Date 0 0

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

  > # Node ID 7969f70ffb81c3a6eee2d4f2f7032b694ce05349

  > # Parent  fc57c20be380f2878f4db139dad66d6cfb42ec62

  > foobar to changedfile

  > diff --git a/changedfile b/changedfile

  > --- a/changedfile

  > +++ b/changedfile

  > @@ -1,1 +1,1 @@

  > -Gello

  > +foobar

  > ENDOF

  > EOF

  $ HGEDITOR="sh ./editor.sh" hg amend --patch

  abort: nothing changed

  [255]

Cannot change lines which are deleted

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > cat > \$1 <<ENDOF

  > # HG changeset patch

  > # User test

  > # Date 0 0

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

  > # Node ID 7969f70ffb81c3a6eee2d4f2f7032b694ce05349

  > # Parent  fc57c20be380f2878f4db139dad66d6cfb42ec62

  > foobar to changedfile

  > diff --git a/changedfile b/changedfile

  > --- a/changedfile

  > +++ b/changedfile

  > @@ -1,1 +1,1 @@

  > -Hello

  > +foobar

  > ENDOF

  > EOF

  $ HGEDITOR="sh ./editor.sh" hg amend --patch

  patching file changedfile

  Hunk #1 FAILED at 0

  failed to apply edited patch: patch failed to apply

  try to fix the patch (yn)? y

  abort: patch unchanged

  [255]

Add more addition to the patch

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > cat > \$1 <<ENDOF

  > # HG changeset patch

  > # User test

  > # Date 0 0

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

  > # Node ID 7969f70ffb81c3a6eee2d4f2f7032b694ce05349

  > # Parent  fc57c20be380f2878f4db139dad66d6cfb42ec62

  > foobar to changedfile

  > diff --git a/changedfile b/changedfile

  > --- a/changedfile

  > +++ b/changedfile

  > @@ -1,1 +1,2 @@

  > -Gello

  > +foobar

  > +babar

  > ENDOF

  > EOF

  $ HGEDITOR="sh ./editor.sh" hg amend --patch

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID 5d54400acb70b88f07128a1df497ed794b0b177b

  # Parent  fc57c20be380f2878f4db139dad66d6cfb42ec62

  foobar to changedfile

  diff --git a/changedfile b/changedfile

  --- a/changedfile

  +++ b/changedfile

  @@ -1,1 +1,2 @@

  -Gello

  +foobar

  +babar

  $ cat changedfile

  foobar

  babar

Introduce files which were not there

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

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > cat > \$1 <<ENDOF

  > # HG changeset patch

  > # User test

  > # Date 0 0

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

  > # Node ID 5d54400acb70b88f07128a1df497ed794b0b177b

  > # Parent  fc57c20be380f2878f4db139dad66d6cfb42ec62

  > foobar to changedfile

  > diff --git a/changedfile b/changedfile

  > --- a/changedfile

  > +++ b/changedfile

  > @@ -1,1 +1,2 @@

  > -Gello

  > +foobar

  > +babar

  > diff --git a/a b/a