$ 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

  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-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)

  $ 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)

Add new file:

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

  saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-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-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

  a

  stripping amended changeset 74609c7f506e

  1 changesets found

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

  1 changesets found

  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:

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

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

  $ echo a >> a

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

  saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-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__

  $ 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

  a

  stripping amended changeset 5f357c7560ab

  1 changesets found

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

  1 changesets found

  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

  a

  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

  a

  stripping intermediate changeset a0ea9b1a4c8c

  stripping amended changeset 7ab3bf440b54

  2 changesets found

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

  1 changesets found

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

  $ hg ci -m 'branch foo'

  $ hg branch default -f

  marked working directory as branch default

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

  $ hg ci --amend -m 'back to default'

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

  $ hg branches

  default                        2:ce12b0b57d46

Close branch:

  $ hg up -q 0

  $ echo b >> b

  $ hg branch foo

  marked working directory as branch foo

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

  $ hg ci -Am 'fork'

  adding b

  $ echo b >> b

  $ hg ci -mb

  $ hg ci --amend --close-branch -m 'closing branch foo'

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

Same thing, different code path:

  $ echo b >> b

  $ hg ci -m 'reopen branch'

  reopening closed branch head 4

  $ echo b >> b

  $ hg ci --amend --close-branch

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

  $ hg branches

  default                        2:ce12b0b57d46

Refuse to amend merges:

  $ hg up -q default

  $ hg merge foo

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci --amend

  abort: cannot amend while merging

  [255]

  $ hg ci -m 'merge'

  $ hg ci --amend

  abort: cannot amend merge changesets

  [255]

Follow copies/renames:

  $ hg mv b c

  $ hg ci -m 'b -> c'

  $ hg mv c d

  $ hg ci --amend -m 'b -> d'

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

  $ hg st --rev '.^' --copies d

  A d

    b

  $ hg cp d e

  $ hg ci -m 'e = d'

  $ hg cp e f

  $ hg ci --amend -m 'f = d'

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

  $ hg st --rev '.^' --copies f

  A f

    d

  $ mv f f.orig

  $ hg rm -A f

  $ hg ci -m removef

  $ hg cp a f

  $ mv f.orig f

  $ hg ci --amend -m replacef

  saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg (glob)

  $ hg st --change . --copies

  $ hg log -r . --template "{file_copies}\n"

Move added file (issue3410):

  $ echo g >> g

  $ hg ci -Am g

  adding g

  $ hg mv g h

  $ hg ci --amend

  saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg (glob)

  $ hg st --change . --copies h

  A h

  $ hg log -r . --template "{file_copies}\n"

Can't rollback an amend:

  $ hg rollback

  no rollback information available

  [1]

Preserve extra dict (issue3430):

  $ hg branch a

  marked working directory as branch a

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

  $ echo a >> a

  $ hg ci -ma

  $ hg ci --amend -m "a'"

  saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg (glob)

  $ hg log -r . --template "{branch}\n"

  a

  $ hg ci --amend -m "a''"

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

  $ hg log -r . --template "{branch}\n"

  a

Also preserve other entries in the dict that are in the old commit,