$ cat << EOF >> $HGRCPATH

  > [format]

  > usegeneraldelta=yes

  > EOF

  $ hg init

Setup:

  $ echo a >> a

  $ hg ci -Am 'base'

  adding a

Refuse to amend public csets:

  $ hg phase -r . -p

  $ hg ci --amend

  abort: cannot amend public changesets

  [255]

  $ hg phase -r . -f -d

  $ echo a >> a

  $ hg ci -Am 'base1'

Nothing to amend:

  $ hg ci --amend -m 'base1'

  nothing changed

  [1]

  $ cat >> $HGRCPATH <<EOF

  > [hooks]

  > pretxncommit.foo = sh -c "echo \\"pretxncommit \$HG_NODE\\"; hg id -r \$HG_NODE"

  > EOF

Amending changeset with changes in working dir:

(and check that --message does not trigger an editor)

  $ echo a >> a

  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'

  pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149

  43f1ba15f28a tip

  saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-f1bf3ab8-amend-backup.hg (glob)

  $ echo 'pretxncommit.foo = ' >> $HGRCPATH

  $ hg diff -c .

  diff -r ad120869acf0 -r 43f1ba15f28a a

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

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

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

   a

  +a

  +a

  $ hg log

  changeset:   1:43f1ba15f28a

  tag:         tip

  user:        test

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

  summary:     amend base1

  changeset:   0:ad120869acf0

  user:        test

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

  summary:     base

Check proper abort for empty message

  $ cat > editor.sh << '__EOF__'

  > #!/bin/sh

  > echo "" > "$1"

  > __EOF__

  $ echo b > b

  $ hg add b

  $ hg summary

  parent: 1:43f1ba15f28a tip

   amend base1

  branch: default

  commit: 1 added, 1 unknown

  update: (current)

  phases: 2 draft

  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend

  transaction abort!

  rollback completed

  abort: empty commit message

  [255]

  $ hg summary

  parent: 1:43f1ba15f28a tip

   amend base1

  branch: default

  commit: 1 added, 1 unknown

  update: (current)

  phases: 2 draft

Add new file:

  $ hg ci --amend -m 'amend base1 new file'

  saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-7a3b3496-amend-backup.hg (glob)

Remove file that was added in amended commit:

(and test logfile option)

(and test that logfile option do not trigger an editor)

  $ hg rm b

  $ echo 'amend base1 remove new file' > ../logfile

  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile

  saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-0b55739a-amend-backup.hg (glob)

  $ hg cat b

  b: no such file in rev 74609c7f506e

  [1]

No changes, just a different message:

  $ hg ci -v --amend -m 'no changes, new message'

  amending changeset 74609c7f506e

  copying changeset 74609c7f506e to ad120869acf0

  committing files:

  a

  committing manifest

  committing changelog

  stripping amended changeset 74609c7f506e

  1 changesets found

  uncompressed size of bundle content:

       254 (changelog)

       163 (manifests)

       129  a

  saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-1bfde511-amend-backup.hg (glob)

  1 changesets found

  uncompressed size of bundle content:

       250 (changelog)

       163 (manifests)

       129  a

  adding branch

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

  committed changeset 1:1cd866679df8

  $ hg diff -c .

  diff -r ad120869acf0 -r 1cd866679df8 a

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

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

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

   a

  +a

  +a

  $ hg log

  changeset:   1:1cd866679df8

  tag:         tip

  user:        test

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

  summary:     no changes, new message

  changeset:   0:ad120869acf0

  user:        test

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

  summary:     base

Disable default date on commit so when -d isn't given, the old date is preserved:

  $ echo '[defaults]' >> $HGRCPATH

  $ echo 'commit=' >> $HGRCPATH

Test -u/-d:

  $ cat > .hg/checkeditform.sh <<EOF

  > env | grep HGEDITFORM

  > true

  > EOF

  $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0'

  HGEDITFORM=commit.amend.normal

  saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-5f5bcb85-amend-backup.hg (glob)

  $ echo a >> a

  $ hg ci --amend -u foo -d '1 0'

  saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-83b10a27-amend-backup.hg (glob)

  $ hg log -r .

  changeset:   1:5f357c7560ab

  tag:         tip

  user:        foo

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

  summary:     no changes, new message

Open editor with old commit message if a message isn't given otherwise:

  $ cat > editor.sh << '__EOF__'

  > #!/bin/sh

  > cat $1

  > echo "another precious commit message" > "$1"

  > __EOF__

at first, test saving last-message.txt

  $ cat > .hg/hgrc << '__EOF__'

  > [hooks]

  > pretxncommit.test-saving-last-message = false

  > __EOF__

  $ rm -f .hg/last-message.txt

  $ hg commit --amend -v -m "message given from command line"

  amending changeset 5f357c7560ab

  copying changeset 5f357c7560ab to ad120869acf0

  committing files:

  a

  committing manifest

  committing changelog

  running hook pretxncommit.test-saving-last-message: false

  transaction abort!

  rollback completed

  abort: pretxncommit.test-saving-last-message hook exited with status 1

  [255]

  $ cat .hg/last-message.txt

  message given from command line (no-eol)

  $ rm -f .hg/last-message.txt

  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v

  amending changeset 5f357c7560ab

  copying changeset 5f357c7560ab to ad120869acf0

  no changes, new message

  HG: Enter commit message.  Lines beginning with 'HG:' are removed.

  HG: Leave message empty to abort commit.

  HG: --

  HG: user: foo

  HG: branch 'default'

  HG: changed a

  committing files:

  a

  committing manifest

  committing changelog

  running hook pretxncommit.test-saving-last-message: false

  transaction abort!

  rollback completed

  abort: pretxncommit.test-saving-last-message hook exited with status 1

  [255]

  $ cat .hg/last-message.txt

  another precious commit message

  $ cat > .hg/hgrc << '__EOF__'

  > [hooks]

  > pretxncommit.test-saving-last-message =

  > __EOF__

then, test editing custom commit message

  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v

  amending changeset 5f357c7560ab

  copying changeset 5f357c7560ab to ad120869acf0

  no changes, new message

  HG: Enter commit message.  Lines beginning with 'HG:' are removed.

  HG: Leave message empty to abort commit.

  HG: --

  HG: user: foo

  HG: branch 'default'

  HG: changed a

  committing files:

  a

  committing manifest

  committing changelog

  stripping amended changeset 5f357c7560ab

  1 changesets found

  uncompressed size of bundle content:

       249 (changelog)

       163 (manifests)

       131  a

  saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-e7c84ade-amend-backup.hg (glob)

  1 changesets found

  uncompressed size of bundle content:

       257 (changelog)

       163 (manifests)

       131  a

  adding branch

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

  committed changeset 1:7ab3bf440b54

Same, but with changes in working dir (different code path):

  $ echo a >> a

  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v

  amending changeset 7ab3bf440b54

  committing files:

  a

  committing manifest

  committing changelog

  copying changeset a0ea9b1a4c8c to ad120869acf0

  another precious commit message

  HG: Enter commit message.  Lines beginning with 'HG:' are removed.

  HG: Leave message empty to abort commit.

  HG: --

  HG: user: foo

  HG: branch 'default'

  HG: changed a

  committing files:

  a

  committing manifest

  committing changelog

  stripping intermediate changeset a0ea9b1a4c8c

  stripping amended changeset 7ab3bf440b54

  2 changesets found

  uncompressed size of bundle content:

       464 (changelog)

       322 (manifests)

       249  a

  saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-8e3b5088-amend-backup.hg (glob)

  1 changesets found

  uncompressed size of bundle content:

       257 (changelog)

       163 (manifests)

       133  a

  adding branch

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

  committed changeset 1:ea22a388757c

  $ rm editor.sh

  $ hg log -r .

  changeset:   1:ea22a388757c

  tag:         tip

  user:        foo

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

  summary:     another precious commit message

Moving bookmarks, preserve active bookmark:

  $ hg book book1

  $ hg book book2

  $ hg ci --amend -m 'move bookmarks'

  saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-e51094db-amend-backup.hg (glob)

  $ hg book

     book1                     1:6cec5aa930e2

   * book2                     1:6cec5aa930e2

  $ echo a >> a

  $ hg ci --amend -m 'move bookmarks'

  saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-e9b06de4-amend-backup.hg (glob)

  $ hg book

     book1                     1:48bb6e53a15f

   * book2                     1:48bb6e53a15f

abort does not loose bookmarks

  $ cat > editor.sh << '__EOF__'

  > #!/bin/sh

  > echo "" > "$1"

  > __EOF__

  $ echo a >> a

  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend

  transaction abort!

  rollback completed

  abort: empty commit message

  [255]

  $ hg book

     book1                     1:48bb6e53a15f

   * book2                     1:48bb6e53a15f

  $ hg revert -Caq

  $ rm editor.sh

  $ echo '[defaults]' >> $HGRCPATH

  $ echo "commit=-d '0 0'" >> $HGRCPATH

Moving branches:

  $ hg branch foo

  marked working directory as branch foo

  (branches are permanent and global, did you want a bookmark?)

  $ echo a >> a