config: use 'experimental.evolution.allowunstable'

Extract 'experimental.evolution' = allowunstable as
'experimental.evolution.allowunstable'.

We keep the new option in the 'experimental.evolution' namespace in order to
stay coherent with other options ('experimental.evolution.bundle-obsmarker'
and 'experimental.evolution.track-operation') ease the renaming as possibly
'evolution.allowunstable'.

Differential Revision: https://phab.mercurial-scm.org/D1150

tests/test-amend.t

@@ -1,234 +1,234 b''
 #testcases obsstore-off obsstore-on
 
   $ cat << EOF >> $HGRCPATH
   > [extensions]
   > amend=
   > debugdrawdag=$TESTDIR/drawdag.py
   > [diff]
   > git=1
   > EOF
 
 #if obsstore-on
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 #endif
 
 Basic amend
 
   $ hg init repo1
   $ cd repo1
   $ hg debugdrawdag <<'EOS'
   > B
   > |
   > A
   > EOS
 
   $ hg update B -q
   $ echo 2 >> B
 
   $ hg amend
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/112478962961-7e959a55-amend.hg (glob) (obsstore-off !)
 #if obsstore-off
   $ hg log -p -G --hidden -T '{rev} {node|short} {desc}\n'
   @  1 be169c7e8dbe B
   |  diff --git a/B b/B
   |  new file mode 100644
   |  --- /dev/null
   |  +++ b/B
   |  @@ -0,0 +1,1 @@
   |  +B2
   |
   o  0 426bada5c675 A
      diff --git a/A b/A
      new file mode 100644
      --- /dev/null
      +++ b/A
      @@ -0,0 +1,1 @@
      +A
      \ No newline at end of file
   
 #else
   $ hg log -p -G --hidden -T '{rev} {node|short} {desc}\n'
   @  2 be169c7e8dbe B
   |  diff --git a/B b/B
   |  new file mode 100644
   |  --- /dev/null
   |  +++ b/B
   |  @@ -0,0 +1,1 @@
   |  +B2
   |
   | x  1 112478962961 B
   |/   diff --git a/B b/B
   |    new file mode 100644
   |    --- /dev/null
   |    +++ b/B
   |    @@ -0,0 +1,1 @@
   |    +B
   |    \ No newline at end of file
   |
   o  0 426bada5c675 A
      diff --git a/A b/A
      new file mode 100644
      --- /dev/null
      +++ b/A
      @@ -0,0 +1,1 @@
      +A
      \ No newline at end of file
   
 #endif
 
 Nothing changed
 
   $ hg amend
   nothing changed
   [1]
 
   $ hg amend -d "0 0"
   nothing changed
   [1]
 
   $ hg amend -d "Thu Jan 01 00:00:00 1970 UTC"
   nothing changed
   [1]
 
 Matcher and metadata options
 
   $ echo 3 > C
   $ echo 4 > D
   $ hg add C D
   $ hg amend -m NEWMESSAGE -I C
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/be169c7e8dbe-7684ddc5-amend.hg (glob) (obsstore-off !)
   $ hg log -r . -T '{node|short} {desc} {files}\n'
   c7ba14d9075b NEWMESSAGE B C
   $ echo 5 > E
   $ rm C
   $ hg amend -d '2000 1000' -u 'Foo <[e-mail]>' -A C D
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/c7ba14d9075b-b3e76daa-amend.hg (glob) (obsstore-off !)
   $ hg log -r . -T '{node|short} {desc} {files} {author} {date}\n'
   14f6c4bcc865 NEWMESSAGE B D Foo <[e-mail]> 2000.01000
 
 Amend with editor
 
   $ cat > $TESTTMP/prefix.sh <<'EOF'
   > printf 'EDITED: ' > $TESTTMP/msg
   > cat "$1" >> $TESTTMP/msg
   > mv $TESTTMP/msg "$1"
   > EOF
   $ chmod +x $TESTTMP/prefix.sh
 
   $ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend --edit
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/14f6c4bcc865-6591f15d-amend.hg (glob) (obsstore-off !)
   $ hg log -r . -T '{node|short} {desc}\n'
   298f085230c3 EDITED: NEWMESSAGE
   $ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend -e -m MSG
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/298f085230c3-d81a6ad3-amend.hg (glob) (obsstore-off !)
   $ hg log -r . -T '{node|short} {desc}\n'
   974f07f28537 EDITED: MSG
 
   $ echo FOO > $TESTTMP/msg
   $ hg amend -l $TESTTMP/msg -m BAR
   abort: options --message and --logfile are mutually exclusive
   [255]
   $ hg amend -l $TESTTMP/msg
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/974f07f28537-edb6470a-amend.hg (glob) (obsstore-off !)
   $ hg log -r . -T '{node|short} {desc}\n'
   507be9bdac71 FOO
 
 Interactive mode
 
   $ touch F G
   $ hg add F G
   $ cat <<EOS | hg amend -i --config ui.interactive=1
   > y
   > n
   > EOS
   diff --git a/F b/F
   new file mode 100644
   examine changes to 'F'? [Ynesfdaq?] y
   
   diff --git a/G b/G
   new file mode 100644
   examine changes to 'G'? [Ynesfdaq?] n
   
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/507be9bdac71-c8077452-amend.hg (glob) (obsstore-off !)
   $ hg log -r . -T '{files}\n'
   B D F
 
 Amend in the middle of a stack
 
   $ hg init $TESTTMP/repo2
   $ cd $TESTTMP/repo2
   $ hg debugdrawdag <<'EOS'
   > C
   > |
   > B
   > |
   > A
   > EOS
 
   $ hg update -q B
   $ echo 2 >> B
   $ hg amend
   abort: cannot amend changeset with children
   [255]
 
 #if obsstore-on
 
 With allowunstable, amend could work in the middle of a stack
 
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
-  > evolution=allowunstable
   > evolution.createmarkers=True
+  > evolution.allowunstable=True
   > EOF
 
   $ hg amend
   $ hg log -T '{rev} {node|short} {desc}\n' -G
   @  3 be169c7e8dbe B
   |
   | o  2 26805aba1e60 C
   | |
   | x  1 112478962961 B
   |/
   o  0 426bada5c675 A
   
 Checking the note stored in the obsmarker
 
   $ echo foo > bar
   $ hg add bar
   $ hg amend --note "adding bar"
   $ hg debugobsolete -r .
   112478962961147124edd43549aedd1a335e44bf be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
   be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 16084da537dd8f84cfdb3055c633772269d62e1b 0 (Thu Jan 01 00:00:00 1970 +0000) {'note': 'adding bar', 'operation': 'amend', 'user': 'test'}
 #endif
 
 Cannot amend public changeset
 
   $ hg phase -r A --public
   $ hg update -C -q A
   $ hg amend -m AMEND
   abort: cannot amend public changesets
   [255]
 
 Amend a merge changeset
 
   $ hg init $TESTTMP/repo3
   $ cd $TESTTMP/repo3
   $ hg debugdrawdag <<'EOS'
   >   C
   >  /|
   > A B
   > EOS
   $ hg update -q C
   $ hg amend -m FOO
   saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/a35c07e8a2a4-15ff4612-amend.hg (glob) (obsstore-off !)
   $ rm .hg/localtags
   $ hg log -G -T '{desc}\n'
   @    FOO
   |\
   | o  B
   |
   o  A
   

tests/test-commit-amend.t

@@ -1,1269 +1,1269 b''
   $ 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-5ab4f721-amend.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__
 
 Update the existing file to ensure that the dirstate is not in pending state
 (where the status of some files in the working copy is not known yet). This in
 turn ensures that when the transaction is aborted due to an empty message during
 the amend, there should be no rollback.
   $ echo a >> a
 
   $ echo b > b
   $ hg add b
   $ hg summary
   parent: 1:43f1ba15f28a tip
    amend base1
   branch: default
   commit: 1 modified, 1 added, 1 unknown
   update: (current)
   phases: 2 draft
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend
   abort: empty commit message
   [255]
   $ hg summary
   parent: 1:43f1ba15f28a tip
    amend base1
   branch: default
   commit: 1 modified, 1 added, 1 unknown
   update: (current)
   phases: 2 draft
 
 Add new file along with modified existing file:
   $ hg ci --amend -m 'amend base1 new file'
   saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-007467c2-amend.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/c16295aaf401-1ada9901-amend.hg (glob)
 
   $ hg cat b
   b: no such file in rev 47343646fa3d
   [1]
 
 No changes, just a different message:
 
   $ hg ci -v --amend -m 'no changes, new message'
   amending changeset 47343646fa3d
   copying changeset 47343646fa3d to ad120869acf0
   committing files:
   a
   committing manifest
   committing changelog
   1 changesets found
   uncompressed size of bundle content:
        254 (changelog)
        163 (manifests)
        131  a
   saved backup bundle to $TESTTMP/.hg/strip-backup/47343646fa3d-c2758885-amend.hg (glob)
   1 changesets found
   uncompressed size of bundle content:
        250 (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:401431e913a1
   $ hg diff -c .
   diff -r ad120869acf0 -r 401431e913a1 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,4 @@
    a
   +a
   +a
   +a
   $ hg log
   changeset:   1:401431e913a1
   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/401431e913a1-5e8e532c-amend.hg (glob)
   $ echo a >> a
   $ hg ci --amend -u foo -d '1 0'
   saved backup bundle to $TESTTMP/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg (glob)
   $ hg log -r .
   changeset:   1:a9a13940fc03
   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 a9a13940fc03
   copying changeset a9a13940fc03 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 a9a13940fc03
   copying changeset a9a13940fc03 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 a9a13940fc03
   copying changeset a9a13940fc03 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
   1 changesets found
   uncompressed size of bundle content:
        249 (changelog)
        163 (manifests)
        133  a
   saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.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:64a124ba1b44
 
 Same, but with changes in working dir (different code path):
 
   $ echo a >> a
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
   amending changeset 64a124ba1b44
   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
   1 changesets found
   uncompressed size of bundle content:
        257 (changelog)
        163 (manifests)
        133  a
   saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg (glob)
   1 changesets found
   uncompressed size of bundle content:
        257 (changelog)
        163 (manifests)
        135  a
   adding branch
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   committed changeset 1:7892795b8e38
 
   $ rm editor.sh
   $ hg log -r .
   changeset:   1:7892795b8e38
   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/7892795b8e38-3fb46217-amend.hg (glob)
   $ hg book
      book1                     1:8311f17e2616
    * book2                     1:8311f17e2616
   $ echo a >> a
   $ hg ci --amend -m 'move bookmarks'
   saved backup bundle to $TESTTMP/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg (glob)
   $ hg book
      book1                     1:a3b65065808c
    * book2                     1:a3b65065808c
 
 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
   abort: empty commit message
   [255]
   $ hg book
      book1                     1:a3b65065808c
    * book2                     1:a3b65065808c
   $ 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
   $ hg ci --amend -m 'back to default'
   saved backup bundle to $TESTTMP/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg (glob)
   $ hg branches
   default                        2:9c07515f2650
 
 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-54245dc7-amend.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-b900d9fa-amend.hg (glob)
   $ hg branches
   default                        2:9c07515f2650
 
 Refuse to amend during a merge:
 
   $ 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'
 
 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/42f3f27a067d-f23cc9f7-amend.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/9198f73182d5-251d584a-amend.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/f0993ab6b482-eda301bf-amend.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/58585e3f095c-0f5ebcda-amend.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/39a162f1d65e-9dfe13d8-amend.hg (glob)
   $ hg log -r . --template "{branch}\n"
   a
   $ hg ci --amend -m "a''"
   saved backup bundle to $TESTTMP/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg (glob)
   $ hg log -r . --template "{branch}\n"
   a
 
 Also preserve other entries in the dict that are in the old commit,
 first graft something so there's an additional entry:
 
   $ hg up 0 -q
   $ echo z > z
   $ hg ci -Am 'fork'
   adding z
   created new head
   $ hg up 11
   5 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg graft 12
   grafting 12:2647734878ef "fork" (tip)
   $ hg ci --amend -m 'graft amend'
   saved backup bundle to $TESTTMP/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg (glob)
   $ hg log -r . --debug | grep extra
   extra:       amend_source=fe8c6f7957ca1665ed77496ed7a07657d469ac60
   extra:       branch=a
   extra:       source=2647734878ef0236dda712fae9c1651cf694ea8a
 
 Preserve phase
 
   $ hg phase '.^::.'
   11: draft
   13: draft
   $ hg phase --secret --force .
   $ hg phase '.^::.'
   11: draft
   13: secret
   $ hg commit --amend -m 'amend for phase' -q
   $ hg phase '.^::.'
   11: draft
   13: secret
 
 Test amend with obsolete
 ---------------------------
 
 Enable obsolete
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
-  > evolution=allowunstable
   > evolution.createmarkers=True
+  > evolution.allowunstable=True
   > EOF
 
 Amend with no files changes
 
   $ hg id -n
   13
   $ hg ci --amend -m 'babar'
   $ hg id -n
   14
   $ hg log -Gl 3 --style=compact
   @  14[tip]:11   682950e85999   1970-01-01 00:00 +0000   test
   |    babar
   |
   | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
   | |    fork
   | ~
   o  11   0ddb275cfad1   1970-01-01 00:00 +0000   test
   |    a''
   ~
   $ hg log -Gl 4 --hidden --style=compact
   @  14[tip]:11   682950e85999   1970-01-01 00:00 +0000   test
   |    babar
   |
   | x  13:11   5167600b0f7a   1970-01-01 00:00 +0000   test
   |/     amend for phase
   |
   | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
   | |    fork
   | ~
   o  11   0ddb275cfad1   1970-01-01 00:00 +0000   test
   |    a''
   ~
 
 Amend with files changes
 
 (note: the extra commit over 15 is a temporary junk I would be happy to get
 ride of)
 
   $ echo 'babar' >> a
   $ hg commit --amend
   $ hg log -Gl 6 --hidden --style=compact
   @  15[tip]:11   a5b42b49b0d5   1970-01-01 00:00 +0000   test
   |    babar
   |
   | x  14:11   682950e85999   1970-01-01 00:00 +0000   test
   |/     babar
   |
   | x  13:11   5167600b0f7a   1970-01-01 00:00 +0000   test
   |/     amend for phase
   |
   | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
   | |    fork
   | ~
   o  11   0ddb275cfad1   1970-01-01 00:00 +0000   test
   |    a''
   |
   o  10   5fa75032e226   1970-01-01 00:00 +0000   test
   |    g
   ~
 
 
 Test that amend does not make it easy to create obsolescence cycle
 ---------------------------------------------------------------------
 
   $ hg id -r 14 --hidden
   682950e85999 (a)
   $ hg revert -ar 14 --hidden
   reverting a
   $ hg commit --amend
   $ hg id
   37973c7e0b61 (a) tip
 
 Test that rewriting leaving instability behind is allowed
 ---------------------------------------------------------------------
 
   $ hg up '.^'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo 'b' >> a
   $ hg log --style compact -r 'children(.)'
   16[tip]:11   37973c7e0b61   1970-01-01 00:00 +0000   test
     babar
   
   $ hg commit --amend
   $ hg log -r 'orphan()'
   changeset:   16:37973c7e0b61
   branch:      a
   parent:      11:0ddb275cfad1
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   instability: orphan
   summary:     babar
   
 
 Amend a merge changeset (with renames and conflicts from the second parent):
 
   $ hg up -q default
   $ hg branch -q bar
   $ hg cp a aa
   $ hg mv z zz
   $ echo cc > cc
   $ hg add cc
   $ hg ci -m aazzcc
   $ hg up -q default
   $ echo a >> a
   $ echo dd > cc
   $ hg add cc
   $ hg ci -m aa
   $ hg merge -q bar
   warning: conflicts while merging cc! (edit, then use 'hg resolve --mark')
   [1]
   $ hg resolve -m cc
   (no more unresolved files)
   $ hg ci -m 'merge bar'
   $ hg log --config diff.git=1 -pr .
   changeset:   20:163cfd7219f7
   tag:         tip
   parent:      19:30d96aeaf27b
   parent:      18:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   diff --git a/cc b/cc
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
   +<<<<<<< working copy: 30d96aeaf27b - test: aa
    dd
   +=======
   +cc
   +>>>>>>> merge rev:    1aa437659d19 bar - test: aazzcc
   diff --git a/z b/zz
   rename from z
   rename to zz
   
   $ hg debugrename aa
   aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
   $ hg debugrename zz
   zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
   $ hg debugrename cc
   cc not renamed
   $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit
   HGEDITFORM=commit.amend.merge
   $ hg log --config diff.git=1 -pr .
   changeset:   21:bca52d4ed186
   tag:         tip
   parent:      19:30d96aeaf27b
   parent:      18:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (amend message)
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   diff --git a/cc b/cc
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
   +<<<<<<< working copy: 30d96aeaf27b - test: aa
    dd
   +=======
   +cc
   +>>>>>>> merge rev:    1aa437659d19 bar - test: aazzcc
   diff --git a/z b/zz
   rename from z
   rename to zz
   
   $ hg debugrename aa
   aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
   $ hg debugrename zz
   zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
   $ hg debugrename cc
   cc not renamed
   $ hg mv zz z
   $ hg ci --amend -m 'merge bar (undo rename)'
   $ hg log --config diff.git=1 -pr .
   changeset:   22:12594a98ca3f
   tag:         tip
   parent:      19:30d96aeaf27b
   parent:      18:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (undo rename)
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   diff --git a/cc b/cc
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
   +<<<<<<< working copy: 30d96aeaf27b - test: aa
    dd
   +=======
   +cc
   +>>>>>>> merge rev:    1aa437659d19 bar - test: aazzcc
   
   $ hg debugrename z
   z not renamed
 
 Amend a merge changeset (with renames during the merge):
 
   $ hg up -q bar
   $ echo x > x
   $ hg add x
   $ hg ci -m x
   $ hg up -q default
   $ hg merge -q bar
   $ hg mv aa aaa
   $ echo aa >> aaa
   $ hg ci -m 'merge bar again'
   $ hg log --config diff.git=1 -pr .
   changeset:   24:dffde028b388
   tag:         tip
   parent:      22:12594a98ca3f
   parent:      23:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar again
   
   diff --git a/aa b/aa
   deleted file mode 100644
   --- a/aa
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -a
   -a
   diff --git a/aaa b/aaa
   new file mode 100644
   --- /dev/null
   +++ b/aaa
   @@ -0,0 +1,3 @@
   +a
   +a
   +aa
   diff --git a/x b/x
   new file mode 100644
   --- /dev/null
   +++ b/x
   @@ -0,0 +1,1 @@
   +x
   
   $ hg debugrename aaa
   aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980
   $ hg mv aaa aa
   $ hg ci --amend -m 'merge bar again (undo rename)'
   $ hg log --config diff.git=1 -pr .
   changeset:   25:18e3ba160489
   tag:         tip
   parent:      22:12594a98ca3f
   parent:      23:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar again (undo rename)
   
   diff --git a/aa b/aa
   --- a/aa
   +++ b/aa
   @@ -1,2 +1,3 @@
    a
    a
   +aa
   diff --git a/x b/x
   new file mode 100644
   --- /dev/null
   +++ b/x
   @@ -0,0 +1,1 @@
   +x
   
   $ hg debugrename aa
   aa not renamed
   $ hg debugrename -r '.^' aa
   aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
 
 Amend a merge changeset (with manifest-level conflicts):
 
   $ hg up -q bar
   $ hg rm aa
   $ hg ci -m 'rm aa'
   $ hg up -q default
   $ echo aa >> aa
   $ hg ci -m aa
   $ hg merge -q bar --config ui.interactive=True << EOF
   > c
   > EOF
   local [working copy] changed aa which other [merge rev] deleted
   use (c)hanged version, (d)elete, or leave (u)nresolved? c
   $ hg ci -m 'merge bar (with conflicts)'
   $ hg log --config diff.git=1 -pr .
   changeset:   28:b4c3035e2544
   tag:         tip
   parent:      27:4b216ca5ba97
   parent:      26:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (with conflicts)
   
   
   $ hg rm aa
   $ hg ci --amend -m 'merge bar (with conflicts, amended)'
   $ hg log --config diff.git=1 -pr .
   changeset:   29:1205ed810051
   tag:         tip
   parent:      27:4b216ca5ba97
   parent:      26:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge bar (with conflicts, amended)
   
   diff --git a/aa b/aa
   deleted file mode 100644
   --- a/aa
   +++ /dev/null
   @@ -1,4 +0,0 @@
   -a
   -a
   -aa
   -aa
   
 Issue 3445: amending with --close-branch a commit that created a new head should fail
 This shouldn't be possible:
 
   $ hg up -q default
   $ hg branch closewithamend
   marked working directory as branch closewithamend
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m..
   $ hg ci --amend --close-branch -m 'closing'
   abort: can only close branch heads
   [255]
 
 This silliness fails:
 
   $ hg branch silliness
   marked working directory as branch silliness
   $ echo b >> b
   $ hg ci --close-branch -m'open and close'
   abort: can only close branch heads
   [255]
 
 Test that amend with --secret creates new secret changeset forcibly
 ---------------------------------------------------------------------
 
   $ hg phase '.^::.'
   29: draft
   30: draft
   $ hg commit --amend --secret -m 'amend as secret' -q
   $ hg phase '.^::.'
   29: draft
   31: secret
 
 Test that amend with --edit invokes editor forcibly
 ---------------------------------------------------
 
   $ hg parents --template "{desc}\n"
   amend as secret
   $ HGEDITOR=cat hg commit --amend -m "editor should be suppressed"
   $ hg parents --template "{desc}\n"
   editor should be suppressed
 
   $ hg status --rev '.^1::.'
   A foo
   $ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit
   editor should be invoked
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'silliness'
   HG: added foo
   $ hg parents --template "{desc}\n"
   editor should be invoked
 
 Test that "diff()" in committemplate works correctly for amending
 -----------------------------------------------------------------
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
   > changeset.commit.amend = {desc}\n
   >     HG: M: {file_mods}
   >     HG: A: {file_adds}
   >     HG: R: {file_dels}
   >     {splitlines(diff()) % 'HG: {line}\n'}
   > EOF
 
   $ hg parents --template "M: {file_mods}\nA: {file_adds}\nR: {file_dels}\n"
   M: 
   A: foo
   R: 
   $ hg status -amr
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo"
   expecting diff of foo
   
   HG: M: 
   HG: A: foo
   HG: R: 
   HG: diff -r 1205ed810051 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
 
   $ echo y > y
   $ hg add y
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y"
   expecting diff of foo and y
   
   HG: M: 
   HG: A: foo y
   HG: R: 
   HG: diff -r 1205ed810051 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
   HG: diff -r 1205ed810051 y
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +y
 
   $ hg rm a
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y"
   expecting diff of a, foo and y
   
   HG: M: 
   HG: A: foo y
   HG: R: a
   HG: diff -r 1205ed810051 a
   HG: --- a/a	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,2 +0,0 @@
   HG: -a
   HG: -a
   HG: diff -r 1205ed810051 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
   HG: diff -r 1205ed810051 y
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +y
 
   $ hg rm x
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y"
   expecting diff of a, foo, x and y
   
   HG: M: 
   HG: A: foo y
   HG: R: a x
   HG: diff -r 1205ed810051 a
   HG: --- a/a	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,2 +0,0 @@
   HG: -a
   HG: -a
   HG: diff -r 1205ed810051 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
   HG: diff -r 1205ed810051 x
   HG: --- a/x	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,1 +0,0 @@
   HG: -x
   HG: diff -r 1205ed810051 y
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +y
 
   $ echo cccc >> cc
   $ hg status -amr
   M cc
   $ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc
   cc should be excluded
   
   HG: M: 
   HG: A: foo y
   HG: R: a x
   HG: diff -r 1205ed810051 a
   HG: --- a/a	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,2 +0,0 @@
   HG: -a
   HG: -a
   HG: diff -r 1205ed810051 foo
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +foo
   HG: diff -r 1205ed810051 x
   HG: --- a/x	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -1,1 +0,0 @@
   HG: -x
   HG: diff -r 1205ed810051 y
   HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   HG: @@ -0,0 +1,1 @@
   HG: +y
 
 Check for issue4405
 -------------------
 
 Setup the repo with a file that gets moved in a second commit.
   $ hg init repo
   $ cd repo
   $ touch a0
   $ hg add a0
   $ hg commit -m a0
   $ hg mv a0 a1
   $ hg commit -m a1
   $ hg up -q 0
   $ hg log -G --template '{rev} {desc}'
   o  1 a1
   |
   @  0 a0
   
 
 Now we branch the repro, but re-use the file contents, so we have a divergence
 in the file revlog topology and the changelog topology.
   $ hg revert --rev 1 --all
   removing a0
   adding a1
   $ hg ci -qm 'a1-amend'
   $ hg log -G --template '{rev} {desc}'
   @  2 a1-amend
   |
   | o  1 a1
   |/
   o  0 a0
   
 
 The way mercurial does amends is by folding the working copy and old commit
 together into another commit (rev 3). During this process, _findlimit is called
 to  check how far back to look for the transitive closure of file copy
 information, but due to the divergence of the filelog and changelog graph
 topologies, before _findlimit was fixed, it returned a rev which was not far
 enough back in this case.
   $ hg mv a1 a2
   $ hg status --copies --rev 0
   A a2
     a0
   R a0
   $ hg ci --amend -q
   $ hg log -G --template '{rev} {desc}'
   @  3 a1-amend
   |
   | o  1 a1
   |/
   o  0 a0
   
 
 Before the fix, the copy information was lost.
   $ hg status --copies --rev 0
   A a2
     a0
   R a0
   $ cd ..
 
 Check that amend properly preserve rename from directory rename (issue-4516)
 
 If a parent of the merge renames a full directory, any files added to the old
 directory in the other parent will be renamed to the new directory. For some
 reason, the rename metadata was when amending such merge. This test ensure we
 do not regress. We have a dedicated repo because it needs a setup with renamed
 directory)
 
   $ hg init issue4516
   $ cd issue4516
   $ mkdir olddirname
   $ echo line1 > olddirname/commonfile.py
   $ hg add olddirname/commonfile.py
   $ hg ci -m first
 
   $ hg branch newdirname
   marked working directory as branch newdirname
   (branches are permanent and global, did you want a bookmark?)
   $ hg mv olddirname newdirname
   moving olddirname/commonfile.py to newdirname/commonfile.py (glob)
   $ hg ci -m rename
 
   $ hg update default
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo line1 > olddirname/newfile.py
   $ hg add olddirname/newfile.py
   $ hg ci -m log
 
   $ hg up newdirname
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ # create newdirname/newfile.py
   $ hg merge default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m add
   $ 
   $ hg debugrename newdirname/newfile.py
   newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob)
   $ hg status -C --change .
   A newdirname/newfile.py
   $ hg status -C --rev 1
   A newdirname/newfile.py
   $ hg status -C --rev 2
   A newdirname/commonfile.py
     olddirname/commonfile.py
   A newdirname/newfile.py
     olddirname/newfile.py
   R olddirname/commonfile.py
   R olddirname/newfile.py
   $ hg debugindex newdirname/newfile.py
      rev    offset  length  delta linkrev nodeid       p1           p2
        0         0      89     -1       3 34a4d536c0c0 000000000000 000000000000
 
   $ echo a >> newdirname/commonfile.py
   $ hg ci --amend -m bug
   $ hg debugrename newdirname/newfile.py
   newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob)
   $ hg debugindex newdirname/newfile.py
      rev    offset  length  delta linkrev nodeid       p1           p2
        0         0      89     -1       3 34a4d536c0c0 000000000000 000000000000
 
 #if execbit
 
 Test if amend preserves executable bit changes
   $ chmod +x newdirname/commonfile.py
   $ hg ci -m chmod
   $ hg ci --amend -m "chmod amended"
   $ hg ci --amend -m "chmod amended second time"
   $ hg log -p --git -r .
   changeset:   7:b1326f52dddf
   branch:      newdirname
   tag:         tip
   parent:      4:7fd235f7cb2f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     chmod amended second time
   
   diff --git a/newdirname/commonfile.py b/newdirname/commonfile.py
   old mode 100644
   new mode 100755
   
 #endif
 
 Test amend with file inclusion options
 --------------------------------------
 
 These tests ensure that we are always amending some files that were part of the
 pre-amend commit. We want to test that the remaining files in the pre-amend
 commit were not changed in the amended commit. We do so by performing a diff of
 the amended commit against its parent commit.
   $ cd ..
   $ hg init testfileinclusions
   $ cd testfileinclusions
   $ echo a > a
   $ echo b > b
   $ hg commit -Aqm "Adding a and b"
 
 Only add changes to a particular file
   $ echo a >> a
   $ echo b >> b
   $ hg commit --amend -I a
   $ hg diff --git -r null -r .
   diff --git a/a b/a
   new file mode 100644
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,2 @@
   +a
   +a
   diff --git a/b b/b
   new file mode 100644
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +b
 
   $ echo a >> a
   $ hg commit --amend b
   $ hg diff --git -r null -r .
   diff --git a/a b/a
   new file mode 100644
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,2 @@
   +a
   +a
   diff --git a/b b/b
   new file mode 100644
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,2 @@
   +b
   +b
 
 Exclude changes to a particular file
   $ echo b >> b
   $ hg commit --amend -X a
   $ hg diff --git -r null -r .
   diff --git a/a b/a
   new file mode 100644
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,2 @@
   +a
   +a
   diff --git a/b b/b
   new file mode 100644
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,3 @@
   +b
   +b
   +b
 
 Check the addremove flag
   $ echo c > c
   $ rm a
   $ hg commit --amend -A
   removing a
   adding c
   $ hg diff --git -r null -r .
   diff --git a/b b/b
   new file mode 100644
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,3 @@
   +b
   +b
   +b
   diff --git a/c b/c
   new file mode 100644
   --- /dev/null
   +++ b/c
   @@ -0,0 +1,1 @@
   +c

tests/test-histedit-arguments.t

@@ -1,553 +1,553 b''
 Test argument handling and various data parsing
 ==================================================
 
 
 Enable extensions used by this test.
   $ cat >>$HGRCPATH <<EOF
   > [extensions]
   > histedit=
   > EOF
 
 Repo setup.
   $ hg init foo
   $ cd foo
   $ echo alpha >> alpha
   $ hg addr
   adding alpha
   $ hg ci -m one
   $ echo alpha >> alpha
   $ hg ci -m two
   $ echo alpha >> alpha
   $ hg ci -m three
   $ echo alpha >> alpha
   $ hg ci -m four
   $ echo alpha >> alpha
   $ hg ci -m five
 
   $ hg log --style compact --graph
   @  4[tip]   08d98a8350f3   1970-01-01 00:00 +0000   test
   |    five
   |
   o  3   c8e68270e35a   1970-01-01 00:00 +0000   test
   |    four
   |
   o  2   eb57da33312f   1970-01-01 00:00 +0000   test
   |    three
   |
   o  1   579e40513370   1970-01-01 00:00 +0000   test
   |    two
   |
   o  0   6058cbb6cfd7   1970-01-01 00:00 +0000   test
        one
   
 
 histedit --continue/--abort with no existing state
 --------------------------------------------------
 
   $ hg histedit --continue
   abort: no histedit in progress
   [255]
   $ hg histedit --abort
   abort: no histedit in progress
   [255]
 
 Run a dummy edit to make sure we get tip^^ correctly via revsingle.
 --------------------------------------------------------------------
 
   $ HGEDITOR=cat hg histedit "tip^^"
   pick eb57da33312f 2 three
   pick c8e68270e35a 3 four
   pick 08d98a8350f3 4 five
   
   # Edit history between eb57da33312f and 08d98a8350f3
   #
   # Commits are listed from least to most recent
   #
   # You can reorder changesets by reordering the lines
   #
   # Commands:
   #
   #  e, edit = use commit, but stop for amending
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
   #  d, drop = remove commit from history
   #  f, fold = use commit, but combine it with the one above
   #  r, roll = like fold, but discard this commit's description and date
   #
 
 Run on a revision not ancestors of the current working directory.
 --------------------------------------------------------------------
 
   $ hg up 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg histedit -r 4
   abort: 08d98a8350f3 is not an ancestor of working directory
   [255]
   $ hg up --quiet
 
 
 Test that we pick the minimum of a revrange
 ---------------------------------------
 
   $ HGEDITOR=cat hg histedit '2::' --commands - << EOF
   > pick eb57da33312f 2 three
   > pick c8e68270e35a 3 four
   > pick 08d98a8350f3 4 five
   > EOF
   $ hg up --quiet
 
   $ HGEDITOR=cat hg histedit 'tip:2' --commands - << EOF
   > pick eb57da33312f 2 three
   > pick c8e68270e35a 3 four
   > pick 08d98a8350f3 4 five
   > EOF
   $ hg up --quiet
 
 Test config specified default
 -----------------------------
 
   $ HGEDITOR=cat hg histedit --config "histedit.defaultrev=only(.) - ::eb57da33312f" --commands - << EOF
   > pick c8e68270e35a 3 four
   > pick 08d98a8350f3 4 five
   > EOF
 
 Run on a revision not descendants of the initial parent
 --------------------------------------------------------------------
 
 Test the message shown for inconsistent histedit state, which may be
 created (and forgotten) by Mercurial earlier than 2.7. This emulates
 Mercurial earlier than 2.7 by renaming ".hg/histedit-state"
 temporarily.
 
   $ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2::
   @  4 08d9 five
   |
   o  3 c8e6 four
   |
   o  2 eb57 three
   |
   ~
   $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF
   > edit 08d98a8350f3 4 five
   > EOF
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   reverting alpha
   Editing (08d98a8350f3), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
 
   $ hg graft --continue
   abort: no graft in progress
   (continue: hg histedit --continue)
   [255]
 
   $ mv .hg/histedit-state .hg/histedit-state.back
   $ hg update --quiet --clean 2
   $ echo alpha >> alpha
   $ mv .hg/histedit-state.back .hg/histedit-state
 
   $ hg histedit --continue
   saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg (glob)
   $ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2::
   @  4 f5ed five
   |
   | o  3 c8e6 four
   |/
   o  2 eb57 three
   |
   ~
 
   $ hg unbundle -q $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg
   $ hg strip -q -r f5ed --config extensions.strip=
   $ hg up -q 08d98a8350f3
 
 Test that missing revisions are detected
 ---------------------------------------
 
   $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
   > pick eb57da33312f 2 three
   > pick 08d98a8350f3 4 five
   > EOF
   hg: parse error: missing rules for changeset c8e68270e35a
   (use "drop c8e68270e35a" to discard, see also: 'hg help -e histedit.config')
   [255]
 
 Test that extra revisions are detected
 ---------------------------------------
 
   $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
   > pick 6058cbb6cfd7 0 one
   > pick c8e68270e35a 3 four
   > pick 08d98a8350f3 4 five
   > EOF
   hg: parse error: pick "6058cbb6cfd7" changeset was not a candidate
   (only use listed changesets)
   [255]
 
 Test malformed line
 ---------------------------------------
 
   $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
   > pickeb57da33312f2three
   > pick c8e68270e35a 3 four
   > pick 08d98a8350f3 4 five
   > EOF
   hg: parse error: malformed line "pickeb57da33312f2three"
   [255]
 
 Test unknown changeset
 ---------------------------------------
 
   $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
   > pick 0123456789ab 2 three
   > pick c8e68270e35a 3 four
   > pick 08d98a8350f3 4 five
   > EOF
   hg: parse error: unknown changeset 0123456789ab listed
   [255]
 
 Test unknown command
 ---------------------------------------
 
   $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
   > coin eb57da33312f 2 three
   > pick c8e68270e35a 3 four
   > pick 08d98a8350f3 4 five
   > EOF
   hg: parse error: unknown action "coin"
   [255]
 
 Test duplicated changeset
 ---------------------------------------
 
 So one is missing and one appear twice.
 
   $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
   > pick eb57da33312f 2 three
   > pick eb57da33312f 2 three
   > pick 08d98a8350f3 4 five
   > EOF
   hg: parse error: duplicated command for changeset eb57da33312f
   [255]
 
 Test bogus rev
 ---------------------------------------
 
   $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
   > pick eb57da33312f 2 three
   > pick 0
   > pick 08d98a8350f3 4 five
   > EOF
   hg: parse error: invalid changeset 0
   [255]
 
 Test short version of command
 ---------------------------------------
 
 Note: we use varying amounts of white space between command name and changeset
 short hash. This tests issue3893.
 
   $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
   > pick eb57da33312f 2 three
   > p    c8e68270e35a 3 four
   > f 08d98a8350f3 4 five
   > EOF
   four
   ***
   five
   
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: test
   HG: branch 'default'
   HG: changed alpha
   saved backup bundle to $TESTTMP/foo/.hg/strip-backup/c8e68270e35a-63d8b8d8-histedit.hg (glob)
 
   $ hg update -q 2
   $ echo x > x
   $ hg add x
   $ hg commit -m'x' x
   created new head
   $ hg histedit -r 'heads(all())'
   abort: The specified revisions must have exactly one common root
   [255]
 
 Test that trimming description using multi-byte characters
 --------------------------------------------------------------------
 
   $ $PYTHON <<EOF
   > fp = open('logfile', 'w')
   > fp.write('12345678901234567890123456789012345678901234567890' +
   >          '12345') # there are 5 more columns for 80 columns
   > 
   > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes
   > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))
   > 
   > fp.close()
   > EOF
   $ echo xx >> x
   $ hg --encoding utf-8 commit --logfile logfile
 
   $ HGEDITOR=cat hg --encoding utf-8 histedit tip
   pick 3d3ea1f3a10b 5 1234567890123456789012345678901234567890123456789012345\xe3\x81\x82... (esc)
   
   # Edit history between 3d3ea1f3a10b and 3d3ea1f3a10b
   #
   # Commits are listed from least to most recent
   #
   # You can reorder changesets by reordering the lines
   #
   # Commands:
   #
   #  e, edit = use commit, but stop for amending
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
   #  d, drop = remove commit from history
   #  f, fold = use commit, but combine it with the one above
   #  r, roll = like fold, but discard this commit's description and date
   #
 
 Test --continue with --keep
 
   $ hg strip -q -r . --config extensions.strip=
   $ hg histedit '.^' -q --keep --commands - << EOF
   > edit eb57da33312f 2 three
   > pick f3cfcca30c44 4 x
   > EOF
   Editing (eb57da33312f), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
   $ echo edit >> alpha
   $ hg histedit -q --continue
   $ hg log -G -T '{rev}:{node|short} {desc}'
   @  6:8fda0c726bf2 x
   |
   o  5:63379946892c three
   |
   | o  4:f3cfcca30c44 x
   | |
   | | o  3:2a30f3cfee78 four
   | |/   ***
   | |    five
   | o  2:eb57da33312f three
   |/
   o  1:579e40513370 two
   |
   o  0:6058cbb6cfd7 one
   
 
 Test that abort fails gracefully on exception
 ----------------------------------------------
   $ hg histedit . -q --commands - << EOF
   > edit 8fda0c726bf2 6 x
   > EOF
   Editing (8fda0c726bf2), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
 Corrupt histedit state file
   $ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit
   $ mv ../corrupt-histedit .hg/histedit-state
   $ hg histedit --abort
   warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up
   abort: .*(No such file or directory:|The system cannot find the file specified).* (re)
   [255]
 Histedit state has been exited
   $ hg summary -q
   parent: 5:63379946892c 
   commit: 1 added, 1 unknown (new branch head)
   update: 4 new changesets (update)
 
   $ cd ..
 
 Set up default base revision tests
 
   $ hg init defaultbase
   $ cd defaultbase
   $ touch foo
   $ hg -q commit -A -m root
   $ echo 1 > foo
   $ hg commit -m 'public 1'
   $ hg phase --force --public -r .
   $ echo 2 > foo
   $ hg commit -m 'draft after public'
   $ hg -q up -r 1
   $ echo 3 > foo
   $ hg commit -m 'head 1 public'
   created new head
   $ hg phase --force --public -r .
   $ echo 4 > foo
   $ hg commit -m 'head 1 draft 1'
   $ echo 5 > foo
   $ hg commit -m 'head 1 draft 2'
   $ hg -q up -r 2
   $ echo 6 > foo
   $ hg commit -m 'head 2 commit 1'
   $ echo 7 > foo
   $ hg commit -m 'head 2 commit 2'
   $ hg -q up -r 2
   $ echo 8 > foo
   $ hg commit -m 'head 3'
   created new head
   $ hg -q up -r 2
   $ echo 9 > foo
   $ hg commit -m 'head 4'
   created new head
   $ hg merge --tool :local -r 8
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m 'merge head 3 into head 4'
   $ echo 11 > foo
   $ hg commit -m 'commit 1 after merge'
   $ echo 12 > foo
   $ hg commit -m 'commit 2 after merge'
 
   $ hg log -G -T '{rev}:{node|short} {phase} {desc}\n'
   @  12:8cde254db839 draft commit 2 after merge
   |
   o  11:6f2f0241f119 draft commit 1 after merge
   |
   o    10:90506cc76b00 draft merge head 3 into head 4
   |\
   | o  9:f8607a373a97 draft head 4
   | |
   o |  8:0da92be05148 draft head 3
   |/
   | o  7:4c35cdf97d5e draft head 2 commit 2
   | |
   | o  6:931820154288 draft head 2 commit 1
   |/
   | o  5:8cdc02b9bc63 draft head 1 draft 2
   | |
   | o  4:463b8c0d2973 draft head 1 draft 1
   | |
   | o  3:23a0c4eefcbf public head 1 public
   | |
   o |  2:4117331c3abb draft draft after public
   |/
   o  1:4426d359ea59 public public 1
   |
   o  0:54136a8ddf32 public root
   
 
 Default base revision should stop at public changesets
 
   $ hg -q up 8cdc02b9bc63
   $ hg histedit --commands - <<EOF
   > pick 463b8c0d2973
   > pick 8cdc02b9bc63
   > EOF
 
 Default base revision should stop at branchpoint
 
   $ hg -q up 4c35cdf97d5e
   $ hg histedit --commands - <<EOF
   > pick 931820154288
   > pick 4c35cdf97d5e
   > EOF
 
 Default base revision should stop at merge commit
 
   $ hg -q up 8cde254db839
   $ hg histedit --commands - <<EOF
   > pick 6f2f0241f119
   > pick 8cde254db839
   > EOF
 
 commit --amend should abort if histedit is in progress
 (issue4800) and markers are not being created.
 Eventually, histedit could perhaps look at `source` extra,
 in which case this test should be revisited.
 
   $ hg -q up 8cde254db839
   $ hg histedit 6f2f0241f119 --commands - <<EOF
   > pick 8cde254db839
   > edit 6f2f0241f119
   > EOF
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging foo
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   Fix up the change (pick 8cde254db839)
   (hg histedit --continue to resume)
   [1]
   $ hg resolve -m --all
   (no more unresolved files)
   continue: hg histedit --continue
   $ hg histedit --cont
   merging foo
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   Editing (6f2f0241f119), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
   $ hg resolve -m --all
   (no more unresolved files)
   continue: hg histedit --continue
   $ hg commit --amend -m 'reject this fold'
   abort: histedit in progress
   (use 'hg histedit --continue' or 'hg histedit --abort')
   [255]
 
 With markers enabled, histedit does not get confused, and
 amend should not be blocked by the ongoing histedit.
 
   $ cat >>$HGRCPATH <<EOF
   > [experimental]
-  > evolution=allowunstable
   > evolution.createmarkers=True
+  > evolution.allowunstable=True
   > EOF
   $ hg commit --amend -m 'allow this fold'
   $ hg histedit --continue
 
   $ cd ..
 
 Test autoverb feature
 
   $ hg init autoverb
   $ cd autoverb
   $ echo alpha >> alpha
   $ hg ci -qAm one
   $ echo alpha >> alpha
   $ hg ci -qm two
   $ echo beta >> beta
   $ hg ci -qAm "roll! one"
 
   $ hg log --style compact --graph
   @  2[tip]   4f34d0f8b5fa   1970-01-01 00:00 +0000   test
   |    roll! one
   |
   o  1   579e40513370   1970-01-01 00:00 +0000   test
   |    two
   |
   o  0   6058cbb6cfd7   1970-01-01 00:00 +0000   test
        one
   
 
 Check that 'roll' is selected by default
 
   $ HGEDITOR=cat hg histedit 0 --config experimental.histedit.autoverb=True
   pick 6058cbb6cfd7 0 one
   roll 4f34d0f8b5fa 2 roll! one
   pick 579e40513370 1 two
   
   # Edit history between 6058cbb6cfd7 and 4f34d0f8b5fa
   #
   # Commits are listed from least to most recent
   #
   # You can reorder changesets by reordering the lines
   #
   # Commands:
   #
   #  e, edit = use commit, but stop for amending
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
   #  d, drop = remove commit from history
   #  f, fold = use commit, but combine it with the one above
   #  r, roll = like fold, but discard this commit's description and date
   #
 
   $ cd ..

tests/test-histedit-obsolete.t

@@ -1,578 +1,578 b''
   $ . "$TESTDIR/histedit-helpers.sh"
 
 Enable obsolete
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > logtemplate= {rev}:{node|short} {desc|firstline}
   > [phases]
   > publish=False
   > [experimental]
-  > evolution=allowunstable
   > evolution.createmarkers=True
+  > evolution.allowunstable=True
   > [extensions]
   > histedit=
   > rebase=
   > EOF
 
 Test that histedit learns about obsolescence not stored in histedit state
   $ hg init boo
   $ cd boo
   $ echo a > a
   $ hg ci -Am a
   adding a
   $ echo a > b
   $ echo a > c
   $ echo a > c
   $ hg ci -Am b
   adding b
   adding c
   $ echo a > d
   $ hg ci -Am c
   adding d
   $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan
   $ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan
   $ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan
   $ hg histedit -r 'all()' --commands plan
   Editing (1b2d564fad96), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
   $ hg st
   A b
   A c
   ? plan
   $ hg commit --amend b
   $ hg histedit --continue
   $ hg log -G
   @  5:46abc7c4d873 b
   |
   o  4:49d44ab2be1b c
   |
   o  0:cb9a9f314b8b a
   
   $ hg debugobsolete
   e72d22b19f8ecf4150ab4f91d0973fd9955d3ddf 49d44ab2be1b67a79127568a67c9c99430633b48 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
   1b2d564fad96311b45362f17c2aa855150efb35f 46abc7c4d8738e8563e577f7889e1b6db3da4199 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   114f4176969ef342759a8a57e6bccefc4234829b 49d44ab2be1b67a79127568a67c9c99430633b48 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
 
 With some node gone missing during the edit.
 
   $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan
   $ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan
   $ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan
   $ hg histedit -r 'all()' --commands plan
   Editing (49d44ab2be1b), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
   $ hg st
   A b
   A d
   ? plan
   $ hg commit --amend -X . -m XXXXXX
   $ hg commit --amend -X . -m b2
   $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup
   $ hg histedit --continue
   $ hg log -G
   @  8:273c1f3b8626 c
   |
   o  7:aba7da937030 b2
   |
   o  0:cb9a9f314b8b a
   
   $ hg debugobsolete
   e72d22b19f8ecf4150ab4f91d0973fd9955d3ddf 49d44ab2be1b67a79127568a67c9c99430633b48 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
   1b2d564fad96311b45362f17c2aa855150efb35f 46abc7c4d8738e8563e577f7889e1b6db3da4199 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   114f4176969ef342759a8a57e6bccefc4234829b 49d44ab2be1b67a79127568a67c9c99430633b48 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   76f72745eac0643d16530e56e2f86e36e40631f1 2ca853e48edbd6453a0674dc0fe28a0974c51b9c 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
   2ca853e48edbd6453a0674dc0fe28a0974c51b9c aba7da93703075eec9fb1dbaf143ff2bc1c49d46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
   49d44ab2be1b67a79127568a67c9c99430633b48 273c1f3b86267ed3ec684bb13af1fa4d6ba56e02 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   46abc7c4d8738e8563e577f7889e1b6db3da4199 aba7da93703075eec9fb1dbaf143ff2bc1c49d46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   $ cd ..
 
 Base setup for the rest of the testing
 ======================================
 
   $ hg init base
   $ cd base
 
   $ for x in a b c d e f ; do
   >     echo $x > $x
   >     hg add $x
   >     hg ci -m $x
   > done
 
   $ hg log --graph
   @  5:652413bf663e f
   |
   o  4:e860deea161a e
   |
   o  3:055a42cdd887 d
   |
   o  2:177f92b77385 c
   |
   o  1:d2ae7f538514 b
   |
   o  0:cb9a9f314b8b a
   
 
   $ HGEDITOR=cat hg histedit 1
   pick d2ae7f538514 1 b
   pick 177f92b77385 2 c
   pick 055a42cdd887 3 d
   pick e860deea161a 4 e
   pick 652413bf663e 5 f
   
   # Edit history between d2ae7f538514 and 652413bf663e
   #
   # Commits are listed from least to most recent
   #
   # You can reorder changesets by reordering the lines
   #
   # Commands:
   #
   #  e, edit = use commit, but stop for amending
   #  m, mess = edit commit message without changing commit content
   #  p, pick = use commit
   #  b, base = checkout changeset and apply further changesets from there
   #  d, drop = remove commit from history
   #  f, fold = use commit, but combine it with the one above
   #  r, roll = like fold, but discard this commit's description and date
   #
   $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
   > pick 177f92b77385 2 c
   > drop d2ae7f538514 1 b
   > pick 055a42cdd887 3 d
   > fold e860deea161a 4 e
   > pick 652413bf663e 5 f
   > EOF
   [1]
   $ hg log --graph --hidden
   @  10:cacdfd884a93 f
   |
   o  9:59d9f330561f d
   |
   | x  8:b558abc46d09 fold-temp-revision e860deea161a
   | |
   | x  7:96e494a2d553 d
   |/
   o  6:b346ab9a313d c
   |
   | x  5:652413bf663e f
   | |
   | x  4:e860deea161a e
   | |
   | x  3:055a42cdd887 d
   | |
   | x  2:177f92b77385 c
   | |
   | x  1:d2ae7f538514 b
   |/
   o  0:cb9a9f314b8b a
   
   $ hg debugobsolete
   d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   652413bf663ef2a641cab26574e46d5f5a64a55a cacdfd884a9321ec4e1de275ef3949fa953a1f83 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   96e494a2d553dd05902ba1cee1d94d4cb7b8faed 0 {b346ab9a313db8537ecf96fca3ca3ca984ef3bd7} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
   b558abc46d09c30f57ac31e85a8a3d64d2e906e4 0 {96e494a2d553dd05902ba1cee1d94d4cb7b8faed} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'histedit', 'user': 'test'}
 
 
 Ensure hidden revision does not prevent histedit
 -------------------------------------------------
 
 create an hidden revision
 
   $ hg histedit 6 --commands - << EOF
   > pick b346ab9a313d 6 c
   > drop 59d9f330561f 7 d
   > pick cacdfd884a93 8 f
   > EOF
   $ hg log --graph
   @  11:c13eb81022ca f
   |
   o  6:b346ab9a313d c
   |
   o  0:cb9a9f314b8b a
   
 check hidden revision are ignored (6 have hidden children 7 and 8)
 
   $ hg histedit 6 --commands - << EOF
   > pick b346ab9a313d 6 c
   > pick c13eb81022ca 8 f
   > EOF
 
 
 
 Test that rewriting leaving instability behind is allowed
 ---------------------------------------------------------------------
 
   $ hg up '.^'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -r 'children(.)'
   11:c13eb81022ca f (no-eol)
   $ hg histedit -r '.' --commands - <<EOF
   > edit b346ab9a313d 6 c
   > EOF
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   adding c
   Editing (b346ab9a313d), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
   $ echo c >> c
   $ hg histedit --continue
 
   $ hg log -r 'orphan()'
   11:c13eb81022ca f (no-eol)
 
 stabilise
 
   $ hg rebase  -r 'orphan()' -d .
   rebasing 11:c13eb81022ca "f"
   $ hg up tip -q
 
 Test dropping of changeset on the top of the stack
 -------------------------------------------------------
 
 Nothing is rewritten below, the working directory parent must be change for the
 dropped changeset to be hidden.
 
   $ cd ..
   $ hg clone base droplast
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd droplast
   $ hg histedit -r '40db8afa467b' --commands - << EOF
   > pick 40db8afa467b 10 c
   > drop b449568bf7fc 11 f
   > EOF
   $ hg log -G
   @  12:40db8afa467b c
   |
   o  0:cb9a9f314b8b a
   
 
 With rewritten ancestors
 
   $ echo e > e
   $ hg add e
   $ hg commit -m g
   $ echo f > f
   $ hg add f
   $ hg commit -m h
   $ hg histedit -r '40db8afa467b' --commands - << EOF
   > pick 47a8561c0449 12 g
   > pick 40db8afa467b 10 c
   > drop 1b3b05f35ff0 13 h
   > EOF
   $ hg log -G
   @  17:ee6544123ab8 c
   |
   o  16:269e713e9eae g
   |
   o  0:cb9a9f314b8b a
   
   $ cd ../base
 
 
 
 Test phases support
 ===========================================
 
 Check that histedit respect immutability
 -------------------------------------------
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n
   > EOF
 
   $ hg ph -pv '.^'
   phase changed for 2 changesets
   $ hg log -G
   @  13:b449568bf7fc (draft) f
   |
   o  12:40db8afa467b (public) c
   |
   o  0:cb9a9f314b8b (public) a
   
   $ hg histedit -r '.~2'
   abort: cannot edit public changeset: cb9a9f314b8b
   (see 'hg help phases' for details)
   [255]
 
 
 Prepare further testing
 -------------------------------------------
 
   $ for x in g h i j k ; do
   >     echo $x > $x
   >     hg add $x
   >     hg ci -m $x
   > done
   $ hg phase --force --secret .~2
   $ hg log -G
   @  18:ee118ab9fa44 (secret) k
   |
   o  17:3a6c53ee7f3d (secret) j
   |
   o  16:b605fb7503f2 (secret) i
   |
   o  15:7395e1ff83bd (draft) h
   |
   o  14:6b70183d2492 (draft) g
   |
   o  13:b449568bf7fc (draft) f
   |
   o  12:40db8afa467b (public) c
   |
   o  0:cb9a9f314b8b (public) a
   
   $ cd ..
 
 simple phase conservation
 -------------------------------------------
 
 Resulting changeset should conserve the phase of the original one whatever the
 phases.new-commit option is.
 
 New-commit as draft (default)
 
   $ cp -R base simple-draft
   $ cd simple-draft
   $ hg histedit -r 'b449568bf7fc' --commands - << EOF
   > edit b449568bf7fc 11 f
   > pick 6b70183d2492 12 g
   > pick 7395e1ff83bd 13 h
   > pick b605fb7503f2 14 i
   > pick 3a6c53ee7f3d 15 j
   > pick ee118ab9fa44 16 k
   > EOF
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
   adding f
   Editing (b449568bf7fc), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
   $ echo f >> f
   $ hg histedit --continue
   $ hg log -G
   @  24:12e89af74238 (secret) k
   |
   o  23:636a8687b22e (secret) j
   |
   o  22:ccaf0a38653f (secret) i
   |
   o  21:11a89d1c2613 (draft) h
   |
   o  20:c1dec7ca82ea (draft) g
   |
   o  19:087281e68428 (draft) f
   |
   o  12:40db8afa467b (public) c
   |
   o  0:cb9a9f314b8b (public) a
   
   $ cd ..
 
 
 New-commit as secret (config)
 
   $ cp -R base simple-secret
   $ cd simple-secret
   $ cat >> .hg/hgrc << EOF
   > [phases]
   > new-commit=secret
   > EOF
   $ hg histedit -r 'b449568bf7fc' --commands - << EOF
   > edit b449568bf7fc 11 f
   > pick 6b70183d2492 12 g
   > pick 7395e1ff83bd 13 h
   > pick b605fb7503f2 14 i
   > pick 3a6c53ee7f3d 15 j
   > pick ee118ab9fa44 16 k
   > EOF
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
   adding f
   Editing (b449568bf7fc), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
   $ echo f >> f
   $ hg histedit --continue
   $ hg log -G
   @  24:12e89af74238 (secret) k
   |
   o  23:636a8687b22e (secret) j
   |
   o  22:ccaf0a38653f (secret) i
   |
   o  21:11a89d1c2613 (draft) h
   |
   o  20:c1dec7ca82ea (draft) g
   |
   o  19:087281e68428 (draft) f
   |
   o  12:40db8afa467b (public) c
   |
   o  0:cb9a9f314b8b (public) a
   
   $ cd ..
 
 
 Changeset reordering
 -------------------------------------------
 
 If a secret changeset is put before a draft one, all descendant should be secret.
 It seems more important to present the secret phase.
 
   $ cp -R base reorder
   $ cd reorder
   $ hg histedit -r 'b449568bf7fc' --commands - << EOF
   > pick b449568bf7fc 11 f
   > pick 3a6c53ee7f3d 15 j
   > pick 6b70183d2492 12 g
   > pick b605fb7503f2 14 i
   > pick 7395e1ff83bd 13 h
   > pick ee118ab9fa44 16 k
   > EOF
   $ hg log -G
   @  23:558246857888 (secret) k
   |
   o  22:28bd44768535 (secret) h
   |
   o  21:d5395202aeb9 (secret) i
   |
   o  20:21edda8e341b (secret) g
   |
   o  19:5ab64f3a4832 (secret) j
   |
   o  13:b449568bf7fc (draft) f
   |
   o  12:40db8afa467b (public) c
   |
   o  0:cb9a9f314b8b (public) a
   
   $ cd ..
 
 Changeset folding
 -------------------------------------------
 
 Folding a secret changeset with a draft one turn the result secret (again,
 better safe than sorry). Folding between same phase changeset still works
 
 Note that there is a few reordering in this series for more extensive test
 
   $ cp -R base folding
   $ cd folding
   $ cat >> .hg/hgrc << EOF
   > [phases]
   > new-commit=secret
   > EOF
   $ hg histedit -r 'b449568bf7fc' --commands - << EOF
   > pick 7395e1ff83bd 13 h
   > fold b449568bf7fc 11 f
   > pick 6b70183d2492 12 g
   > fold 3a6c53ee7f3d 15 j
   > pick b605fb7503f2 14 i
   > fold ee118ab9fa44 16 k
   > EOF
   $ hg log -G
   @  27:f9daec13fb98 (secret) i
   |
   o  24:49807617f46a (secret) g
   |
   o  21:050280826e04 (draft) h
   |
   o  12:40db8afa467b (public) c
   |
   o  0:cb9a9f314b8b (public) a
   
   $ hg co 49807617f46a
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo wat >> wat
   $ hg add wat
   $ hg ci -m 'add wat'
   created new head
   $ hg merge f9daec13fb98
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge'
   $ echo not wat > wat
   $ hg ci -m 'modify wat'
   $ hg histedit 050280826e04
   abort: cannot edit history that contains merges
   [255]
   $ cd ..
 
 Check abort behavior
 -------------------------------------------
 
 We checks that abort properly clean the repository so the same histedit can be
 attempted later.
 
   $ cp -R base abort
   $ cd abort
   $ hg histedit -r 'b449568bf7fc' --commands - << EOF
   > pick b449568bf7fc 13 f
   > pick 7395e1ff83bd 15 h
   > pick 6b70183d2492 14 g
   > pick b605fb7503f2 16 i
   > roll 3a6c53ee7f3d 17 j
   > edit ee118ab9fa44 18 k
   > EOF
   Editing (ee118ab9fa44), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
 
   $ hg histedit --abort
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/abort/.hg/strip-backup/4dc06258baa6-dff4ef05-backup.hg (glob)
 
   $ hg log -G
   @  18:ee118ab9fa44 (secret) k
   |
   o  17:3a6c53ee7f3d (secret) j
   |
   o  16:b605fb7503f2 (secret) i
   |
   o  15:7395e1ff83bd (draft) h
   |
   o  14:6b70183d2492 (draft) g
   |
   o  13:b449568bf7fc (draft) f
   |
   o  12:40db8afa467b (public) c
   |
   o  0:cb9a9f314b8b (public) a
   
   $ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.stabilization.track-operation=1
   > pick b449568bf7fc 13 f
   > pick 7395e1ff83bd 15 h
   > pick 6b70183d2492 14 g
   > pick b605fb7503f2 16 i
   > pick 3a6c53ee7f3d 17 j
   > edit ee118ab9fa44 18 k
   > EOF
   Editing (ee118ab9fa44), you may commit or record as needed now.
   (hg histedit --continue to resume)
   [1]
   $ hg histedit --continue --config experimental.stabilization.track-operation=1
   $ hg log -G
   @  23:175d6b286a22 (secret) k
   |
   o  22:44ca09d59ae4 (secret) j
   |
   o  21:31747692a644 (secret) i
   |
   o  20:9985cd4f21fa (draft) g
   |
   o  19:4dc06258baa6 (draft) h
   |
   o  13:b449568bf7fc (draft) f
   |
   o  12:40db8afa467b (public) c
   |
   o  0:cb9a9f314b8b (public) a
   
   $ hg debugobsolete --rev .
   ee118ab9fa44ebb86be85996548b5517a39e5093 175d6b286a224c23f192e79a581ce83131a53fa2 0 (*) {'operation': 'histedit', 'user': 'test'} (glob)

tests/test-rebase-brute-force.t

@@ -1,56 +1,56 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > drawdag=$TESTDIR/drawdag.py
   > bruterebase=$TESTDIR/bruterebase.py
   > [experimental]
-  > evolution=allowunstable
   > evolution.createmarkers=True
+  > evolution.allowunstable=True
   > EOF
   $ init() {
   >   N=`expr ${N:-0} + 1`
   >   cd $TESTTMP && hg init repo$N && cd repo$N
   >   hg debugdrawdag
   > }
 
 Source looks like "N"
 
   $ init <<'EOS'
   > C D
   > |\|
   > A B Z
   > EOS
 
   $ hg debugbruterebase 'all()-Z' Z
      A: A':Z
      B: B':Z
     AB: A':Z B':Z
      C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents
     AC: A':Z C':A'B
     BC: B':Z C':B'A
    ABC: A':Z B':Z C':A'B'
      D: D':Z
     AD: A':Z D':Z
     BD: B':Z D':B'
    ABD: A':Z B':Z D':B'
     CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents
    ACD: A':Z C':A'B D':Z
    BCD: B':Z C':B'A D':B'
   ABCD: A':Z B':Z C':A'B' D':B'
 
 Moving backwards
 
   $ init <<'EOS'
   > C
   > |\
   > A B
   > |
   > Z
   > EOS
   $ hg debugbruterebase 'all()-Z' Z
     B: B':Z
     A: 
    BA: B':Z
     C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents
    BC: B':Z C':B'A
    AC: 
   BAC: B':Z C':B'A

tests/test-rebase-obsolete.t

@@ -1,1376 +1,1376 b''
 ==========================
 Test rebase with obsolete
 ==========================
 
 Enable obsolete
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > logtemplate= {rev}:{node|short} {desc|firstline}
   > [experimental]
-  > evolution=allowunstable
   > evolution.createmarkers=True
+  > evolution.allowunstable=True
   > [phases]
   > publish=False
   > [extensions]
   > rebase=
   > drawdag=$TESTDIR/drawdag.py
   > EOF
 
 Setup rebase canonical repo
 
   $ hg init base
   $ cd base
   $ hg unbundle "$TESTDIR/bundles/rebase.hg"
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 7 changes to 7 files (+2 heads)
   new changesets cd010b8cd998:02de42196ebe
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up tip
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -G
   @  7:02de42196ebe H
   |
   | o  6:eea13746799a G
   |/|
   o |  5:24b6387c8c8c F
   | |
   | o  4:9520eea781bc E
   |/
   | o  3:32af7686d403 D
   | |
   | o  2:5fddd98957c8 C
   | |
   | o  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
   $ cd ..
 
 simple rebase
 ---------------------------------
 
   $ hg clone base simple
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd simple
   $ hg up 32af7686d403
   3 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg rebase -d eea13746799a
   rebasing 1:42ccdea3bb16 "B"
   rebasing 2:5fddd98957c8 "C"
   rebasing 3:32af7686d403 "D"
   $ hg log -G
   @  10:8eeb3c33ad33 D
   |
   o  9:2327fea05063 C
   |
   o  8:e4e5be0395b2 B
   |
   | o  7:02de42196ebe H
   | |
   o |  6:eea13746799a G
   |\|
   | o  5:24b6387c8c8c F
   | |
   o |  4:9520eea781bc E
   |/
   o  0:cd010b8cd998 A
   
   $ hg log --hidden -G
   @  10:8eeb3c33ad33 D
   |
   o  9:2327fea05063 C
   |
   o  8:e4e5be0395b2 B
   |
   | o  7:02de42196ebe H
   | |
   o |  6:eea13746799a G
   |\|
   | o  5:24b6387c8c8c F
   | |
   o |  4:9520eea781bc E
   |/
   | x  3:32af7686d403 D
   | |
   | x  2:5fddd98957c8 C
   | |
   | x  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
   $ hg debugobsolete
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 e4e5be0395b2cbd471ed22a26b1b6a1a0658a794 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 2327fea05063f39961b14cb69435a9898dc9a245 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   32af7686d403cf45b5d95f2d70cebea587ac806a 8eeb3c33ad33d452c89e5dcf611c347f978fb42b 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
 
 
   $ cd ..
 
 empty changeset
 ---------------------------------
 
   $ hg clone base empty
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd empty
   $ hg up eea13746799a
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 We make a copy of both the first changeset in the rebased and some other in the
 set.
 
   $ hg graft 42ccdea3bb16 32af7686d403
   grafting 1:42ccdea3bb16 "B"
   grafting 3:32af7686d403 "D"
   $ hg rebase  -s 42ccdea3bb16 -d .
   rebasing 1:42ccdea3bb16 "B"
   note: rebase of 1:42ccdea3bb16 created no changes to commit
   rebasing 2:5fddd98957c8 "C"
   rebasing 3:32af7686d403 "D"
   note: rebase of 3:32af7686d403 created no changes to commit
   $ hg log -G
   o  10:5ae4c968c6ac C
   |
   @  9:08483444fef9 D
   |
   o  8:8877864f1edb B
   |
   | o  7:02de42196ebe H
   | |
   o |  6:eea13746799a G
   |\|
   | o  5:24b6387c8c8c F
   | |
   o |  4:9520eea781bc E
   |/
   o  0:cd010b8cd998 A
   
   $ hg log --hidden -G
   o  10:5ae4c968c6ac C
   |
   @  9:08483444fef9 D
   |
   o  8:8877864f1edb B
   |
   | o  7:02de42196ebe H
   | |
   o |  6:eea13746799a G
   |\|
   | o  5:24b6387c8c8c F
   | |
   o |  4:9520eea781bc E
   |/
   | x  3:32af7686d403 D
   | |
   | x  2:5fddd98957c8 C
   | |
   | x  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
   $ hg debugobsolete
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
 
 
 More complex case where part of the rebase set were already rebased
 
   $ hg rebase --rev 'desc(D)' --dest 'desc(H)'
   rebasing 9:08483444fef9 "D"
   $ hg debugobsolete
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   $ hg log -G
   @  11:4596109a6a43 D
   |
   | o  10:5ae4c968c6ac C
   | |
   | x  9:08483444fef9 D
   | |
   | o  8:8877864f1edb B
   | |
   o |  7:02de42196ebe H
   | |
   | o  6:eea13746799a G
   |/|
   o |  5:24b6387c8c8c F
   | |
   | o  4:9520eea781bc E
   |/
   o  0:cd010b8cd998 A
   
   $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True
   rebasing 8:8877864f1edb "B"
   note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" (tip)
   rebasing 10:5ae4c968c6ac "C"
   $ hg debugobsolete
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   $ hg log --rev 'contentdivergent()'
   $ hg log -G
   o  13:98f6af4ee953 C
   |
   o  12:462a34d07e59 B
   |
   @  11:4596109a6a43 D
   |
   o  7:02de42196ebe H
   |
   | o  6:eea13746799a G
   |/|
   o |  5:24b6387c8c8c F
   | |
   | o  4:9520eea781bc E
   |/
   o  0:cd010b8cd998 A
   
   $ hg log --style default --debug -r 4596109a6a4328c398bde3a4a3b6737cfade3003
   changeset:   11:4596109a6a4328c398bde3a4a3b6737cfade3003
   phase:       draft
   parent:      7:02de42196ebee42ef284b6780a87cdc96e8eaab6
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    11:a91006e3a02f1edf631f7018e6e5684cf27dd905
   user:        Nicolas Dumazet <[e-mail]>
   date:        Sat Apr 30 15:24:48 2011 +0200
   files+:      D
   extra:       branch=default
   extra:       rebase_source=08483444fef91d6224f6655ee586a65d263ad34c
   extra:       source=32af7686d403cf45b5d95f2d70cebea587ac806a
   description:
   D
   
   
   $ hg up -qr 'desc(G)'
   $ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003
   grafting 11:4596109a6a43 "D"
   $ hg up -qr 'desc(E)'
   $ hg rebase -s tip -d .
   rebasing 14:9e36056a46e3 "D" (tip)
   $ hg log --style default --debug -r tip
   changeset:   15:627d4614809036ba22b9e7cb31638ddc06ab99ab
   tag:         tip
   phase:       draft
   parent:      4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42
   user:        Nicolas Dumazet <[e-mail]>
   date:        Sat Apr 30 15:24:48 2011 +0200
   files+:      D
   extra:       branch=default
   extra:       intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003
   extra:       rebase_source=9e36056a46e37c9776168c7375734eebc70e294f
   extra:       source=32af7686d403cf45b5d95f2d70cebea587ac806a
   description:
   D
   
   
 Start rebase from a commit that is obsolete but not hidden only because it's
 a working copy parent. We should be moved back to the starting commit as usual
 even though it is hidden (until we're moved there).
 
   $ hg --hidden up -qr 'first(hidden())'
   $ hg rebase --rev 13 --dest 15
   rebasing 13:98f6af4ee953 "C"
   $ hg log -G
   o  16:294a2b93eb4d C
   |
   o  15:627d46148090 D
   |
   | o  12:462a34d07e59 B
   | |
   | o  11:4596109a6a43 D
   | |
   | o  7:02de42196ebe H
   | |
   +---o  6:eea13746799a G
   | |/
   | o  5:24b6387c8c8c F
   | |
   o |  4:9520eea781bc E
   |/
   | @  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
 
   $ cd ..
 
 collapse rebase
 ---------------------------------
 
   $ hg clone base collapse
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd collapse
   $ hg rebase  -s 42ccdea3bb16 -d eea13746799a --collapse
   rebasing 1:42ccdea3bb16 "B"
   rebasing 2:5fddd98957c8 "C"
   rebasing 3:32af7686d403 "D"
   $ hg log -G
   o  8:4dc2197e807b Collapsed revision
   |
   | @  7:02de42196ebe H
   | |
   o |  6:eea13746799a G
   |\|
   | o  5:24b6387c8c8c F
   | |
   o |  4:9520eea781bc E
   |/
   o  0:cd010b8cd998 A
   
   $ hg log --hidden -G
   o  8:4dc2197e807b Collapsed revision
   |
   | @  7:02de42196ebe H
   | |
   o |  6:eea13746799a G
   |\|
   | o  5:24b6387c8c8c F
   | |
   o |  4:9520eea781bc E
   |/
   | x  3:32af7686d403 D
   | |
   | x  2:5fddd98957c8 C
   | |
   | x  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
   $ hg id --debug -r tip
   4dc2197e807bae9817f09905b50ab288be2dbbcf tip
   $ hg debugobsolete
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
 
   $ cd ..
 
 Rebase set has hidden descendants
 ---------------------------------
 
 We rebase a changeset which has a hidden changeset. The hidden changeset must
 not be rebased.
 
   $ hg clone base hidden
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd hidden
   $ hg rebase -s 5fddd98957c8 -d eea13746799a
   rebasing 2:5fddd98957c8 "C"
   rebasing 3:32af7686d403 "D"
   $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe
   rebasing 1:42ccdea3bb16 "B"
   $ hg log -G
   o  10:7c6027df6a99 B
   |
   | o  9:cf44d2f5a9f4 D
   | |
   | o  8:e273c5e7d2d2 C
   | |
   @ |  7:02de42196ebe H
   | |
   | o  6:eea13746799a G
   |/|
   o |  5:24b6387c8c8c F
   | |
   | o  4:9520eea781bc E
   |/
   o  0:cd010b8cd998 A
   
   $ hg log --hidden -G
   o  10:7c6027df6a99 B
   |
   | o  9:cf44d2f5a9f4 D
   | |
   | o  8:e273c5e7d2d2 C
   | |
   @ |  7:02de42196ebe H
   | |
   | o  6:eea13746799a G
   |/|
   o |  5:24b6387c8c8c F
   | |
   | o  4:9520eea781bc E
   |/
   | x  3:32af7686d403 D
   | |
   | x  2:5fddd98957c8 C
   | |
   | x  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
   $ hg debugobsolete
   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
 
 Test that rewriting leaving instability behind is allowed
 ---------------------------------------------------------------------
 
   $ hg log -r 'children(8)'
   9:cf44d2f5a9f4 D (no-eol)
   $ hg rebase -r 8
   rebasing 8:e273c5e7d2d2 "C"
   $ hg log -G
   o  11:0d8f238b634c C
   |
   o  10:7c6027df6a99 B
   |
   | o  9:cf44d2f5a9f4 D
   | |
   | x  8:e273c5e7d2d2 C
   | |
   @ |  7:02de42196ebe H
   | |
   | o  6:eea13746799a G
   |/|
   o |  5:24b6387c8c8c F
   | |
   | o  4:9520eea781bc E
   |/
   o  0:cd010b8cd998 A
   
 
 
 Test multiple root handling
 ------------------------------------
 
   $ hg rebase --dest 4 --rev '7+11+9'
   rebasing 9:cf44d2f5a9f4 "D"
   rebasing 7:02de42196ebe "H"
   rebasing 11:0d8f238b634c "C" (tip)
   $ hg log -G
   o  14:1e8370e38cca C
   |
   @  13:bfe264faf697 H
   |
   | o  12:102b4c1d889b D
   |/
   | o  10:7c6027df6a99 B
   | |
   | x  7:02de42196ebe H
   | |
   +---o  6:eea13746799a G
   | |/
   | o  5:24b6387c8c8c F
   | |
   o |  4:9520eea781bc E
   |/
   o  0:cd010b8cd998 A
   
   $ cd ..
 
 Detach both parents
 
   $ hg init double-detach
   $ cd double-detach
 
   $ hg debugdrawdag <<EOF
   >   F
   >  /|
   > C E
   > | |
   > B D G
   >  \|/
   >   A
   > EOF
 
   $ hg rebase -d G -r 'B + D + F'
   rebasing 1:112478962961 "B" (B)
   rebasing 2:b18e25de2cf5 "D" (D)
   rebasing 6:f15c3adaf214 "F" (F tip)
   abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents
   [255]
 
   $ cd ..
 
 test on rebase dropping a merge
 
 (setup)
 
   $ hg init dropmerge
   $ cd dropmerge
   $ hg unbundle "$TESTDIR/bundles/rebase.hg"
   adding changesets
   adding manifests
   adding file changes
   added 8 changesets with 7 changes to 7 files (+2 heads)
   new changesets cd010b8cd998:02de42196ebe
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up 3
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 7
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'M'
   $ echo I > I
   $ hg add I
   $ hg ci -m I
   $ hg log -G
   @  9:4bde274eefcf I
   |
   o    8:53a6a128b2b7 M
   |\
   | o  7:02de42196ebe H
   | |
   | | o  6:eea13746799a G
   | |/|
   | o |  5:24b6387c8c8c F
   | | |
   | | o  4:9520eea781bc E
   | |/
   o |  3:32af7686d403 D
   | |
   o |  2:5fddd98957c8 C
   | |
   o |  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
 (actual test)
 
   $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
   rebasing 3:32af7686d403 "D"
   rebasing 7:02de42196ebe "H"
   rebasing 9:4bde274eefcf "I" (tip)
   $ hg log -G
   @  12:acd174b7ab39 I
   |
   o  11:6c11a6218c97 H
   |
   | o  10:b5313c85b22e D
   |/
   | o    8:53a6a128b2b7 M
   | |\
   | | x  7:02de42196ebe H
   | | |
   o---+  6:eea13746799a G
   | | |
   | | o  5:24b6387c8c8c F
   | | |
   o---+  4:9520eea781bc E
    / /
   x |  3:32af7686d403 D
   | |
   o |  2:5fddd98957c8 C
   | |
   o |  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
 
 Test hidden changesets in the rebase set (issue4504)
 
   $ hg up --hidden 9
   3 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo J > J
   $ hg add J
   $ hg commit -m J
   $ hg debugobsolete `hg log --rev . -T '{node}'`
   obsoleted 1 changesets
 
   $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
   rebasing 9:4bde274eefcf "I"
   rebasing 13:06edfc82198f "J" (tip)
   $ hg log -G
   @  15:5ae8a643467b J
   |
   o  14:9ad579b4a5de I
   |
   | o  12:acd174b7ab39 I
   | |
   | o  11:6c11a6218c97 H
   | |
   o |  10:b5313c85b22e D
   |/
   | o    8:53a6a128b2b7 M
   | |\
   | | x  7:02de42196ebe H
   | | |
   o---+  6:eea13746799a G
   | | |
   | | o  5:24b6387c8c8c F
   | | |
   o---+  4:9520eea781bc E
    / /
   x |  3:32af7686d403 D
   | |
   o |  2:5fddd98957c8 C
   | |
   o |  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
   $ hg up 14 -C
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "K" > K
   $ hg add K
   $ hg commit --amend -m "K"
   $ echo "L" > L
   $ hg add L
   $ hg commit -m "L"
   $ hg up '.^'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "M" > M
   $ hg add M
   $ hg commit --amend -m "M"
   $ hg log -G
   @  18:bfaedf8eb73b M
   |
   | o  17:97219452e4bd L
   | |
   | x  16:fc37a630c901 K
   |/
   | o  15:5ae8a643467b J
   | |
   | x  14:9ad579b4a5de I
   |/
   | o  12:acd174b7ab39 I
   | |
   | o  11:6c11a6218c97 H
   | |
   o |  10:b5313c85b22e D
   |/
   | o    8:53a6a128b2b7 M
   | |\
   | | x  7:02de42196ebe H
   | | |
   o---+  6:eea13746799a G
   | | |
   | | o  5:24b6387c8c8c F
   | | |
   o---+  4:9520eea781bc E
    / /
   x |  3:32af7686d403 D
   | |
   o |  2:5fddd98957c8 C
   | |
   o |  1:42ccdea3bb16 B
   |/
   o  0:cd010b8cd998 A
   
   $ hg rebase -s 14 -d 17 --config experimental.rebaseskipobsolete=True
   note: not rebasing 14:9ad579b4a5de "I", already in destination as 16:fc37a630c901 "K"
   rebasing 15:5ae8a643467b "J"
 
   $ cd ..
 
 Skip obsolete changeset even with multiple hops
 -----------------------------------------------
 
 setup
 
   $ hg init obsskip
   $ cd obsskip
   $ cat << EOF >> .hg/hgrc
   > [experimental]
   > rebaseskipobsolete = True
   > [extensions]
   > strip =
   > EOF
   $ echo A > A
   $ hg add A
   $ hg commit -m A
   $ echo B > B
   $ hg add B
   $ hg commit -m B0
   $ hg commit --amend -m B1
   $ hg commit --amend -m B2
   $ hg up --hidden 'desc(B0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo C > C
   $ hg add C
   $ hg commit -m C
 
 Rebase finds its way in a chain of marker
 
   $ hg rebase -d 'desc(B2)'
   note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2"
   rebasing 4:212cb178bcbb "C" (tip)
 
 Even when the chain include missing node
 
   $ hg up --hidden 'desc(B0)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo D > D
   $ hg add D
   $ hg commit -m D
   $ hg --hidden strip -r 'desc(B1)'
   saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg (glob)
 
   $ hg rebase -d 'desc(B2)'
   note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2"
   rebasing 5:1a79b7535141 "D" (tip)
   $ hg up 4
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "O" > O
   $ hg add O
   $ hg commit -m O
   $ echo "P" > P
   $ hg add P
   $ hg commit -m P
   $ hg log -G
   @  8:8d47583e023f P
   |
   o  7:360bbaa7d3ce O
   |
   | o  6:9c48361117de D
   | |
   o |  4:ff2c4d47b71d C
   |/
   o  2:261e70097290 B2
   |
   o  0:4a2df7238c3b A
   
   $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true
   obsoleted 1 changesets
   $ hg rebase -d 6 -r "4::"
   rebasing 4:ff2c4d47b71d "C"
   note: not rebasing 7:360bbaa7d3ce "O", it has no successor
   rebasing 8:8d47583e023f "P" (tip)
 
 If all the changeset to be rebased are obsolete and present in the destination, we
 should display a friendly error message
 
   $ hg log -G
   @  10:121d9e3bc4c6 P
   |
   o  9:4be60e099a77 C
   |
   o  6:9c48361117de D
   |
   o  2:261e70097290 B2
   |
   o  0:4a2df7238c3b A
   
 
   $ hg up 9
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "non-relevant change" > nonrelevant
   $ hg add nonrelevant
   $ hg commit -m nonrelevant
   created new head
   $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true
   obsoleted 1 changesets
   $ hg rebase -r . -d 10
   note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
 
 If a rebase is going to create divergence, it should abort
 
   $ hg log -G
   @  10:121d9e3bc4c6 P
   |
   o  9:4be60e099a77 C
   |
   o  6:9c48361117de D
   |
   o  2:261e70097290 B2
   |
   o  0:4a2df7238c3b A
   
 
   $ hg up 9
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "john" > doe
   $ hg add doe
   $ hg commit -m "john doe"
   created new head
   $ hg up 10
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "foo" > bar
   $ hg add bar
   $ hg commit --amend -m "10'"
   $ hg up 10 --hidden
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "bar" > foo
   $ hg add foo
   $ hg commit -m "bar foo"
   $ hg log -G
   @  14:73568ab6879d bar foo
   |
   | o  13:77d874d096a2 10'
   | |
   | | o  12:3eb461388009 john doe
   | |/
   x |  10:121d9e3bc4c6 P
   |/
   o  9:4be60e099a77 C
   |
   o  6:9c48361117de D
   |
   o  2:261e70097290 B2
   |
   o  0:4a2df7238c3b A
   
   $ hg summary
   parent: 14:73568ab6879d tip (orphan)
    bar foo
   branch: default
   commit: (clean)
   update: 2 new changesets, 3 branch heads (merge)
   phases: 8 draft
   orphan: 1 changesets
   $ hg rebase -s 10 -d 12
   abort: this rebase will cause divergences from: 121d9e3bc4c6
   (to force the rebase please set experimental.allowdivergence=True)
   [255]
   $ hg log -G
   @  14:73568ab6879d bar foo
   |
   | o  13:77d874d096a2 10'
   | |
   | | o  12:3eb461388009 john doe
   | |/
   x |  10:121d9e3bc4c6 P
   |/
   o  9:4be60e099a77 C
   |
   o  6:9c48361117de D
   |
   o  2:261e70097290 B2
   |
   o  0:4a2df7238c3b A
   
 With experimental.allowdivergence=True, rebase can create divergence
 
   $ hg rebase -s 10 -d 12 --config experimental.allowdivergence=True
   rebasing 10:121d9e3bc4c6 "P"
   rebasing 14:73568ab6879d "bar foo" (tip)
   $ hg summary
   parent: 16:61bd55f69bc4 tip
    bar foo
   branch: default
   commit: (clean)
   update: 1 new changesets, 2 branch heads (merge)
   phases: 8 draft
   content-divergent: 2 changesets
 
 rebase --continue + skipped rev because their successors are in destination
 we make a change in trunk and work on conflicting changes to make rebase abort.
 
   $ hg log -G -r 16::
   @  16:61bd55f69bc4 bar foo
   |
   ~
 
 Create the two changes in trunk
   $ printf "a" > willconflict
   $ hg add willconflict
   $ hg commit -m "willconflict first version"
 
   $ printf "dummy" > C
   $ hg commit -m "dummy change successor"
 
 Create the changes that we will rebase
   $ hg update -C 16 -q
   $ printf "b" > willconflict
   $ hg add willconflict
   $ hg commit -m "willconflict second version"
   created new head
   $ printf "dummy" > K
   $ hg add K
   $ hg commit -m "dummy change"
   $ printf "dummy" > L
   $ hg add L
   $ hg commit -m "dummy change"
   $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true
   obsoleted 1 changesets
 
   $ hg log -G -r 16::
   @  21:7bdc8a87673d dummy change
   |
   x  20:8b31da3c4919 dummy change
   |
   o  19:b82fb57ea638 willconflict second version
   |
   | o  18:601db7a18f51 dummy change successor
   | |
   | o  17:357ddf1602d5 willconflict first version
   |/
   o  16:61bd55f69bc4 bar foo
   |
   ~
   $ hg rebase -r ".^^ + .^ + ." -d 18
   rebasing 19:b82fb57ea638 "willconflict second version"
   merging willconflict
   warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
   $ hg resolve --mark willconflict
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
   rebasing 19:b82fb57ea638 "willconflict second version"
   note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor"
   rebasing 21:7bdc8a87673d "dummy change" (tip)
   $ cd ..
 
 Rebase merge where successor of one parent is equal to destination (issue5198)
 
   $ hg init p1-succ-is-dest
   $ cd p1-succ-is-dest
 
   $ hg debugdrawdag <<EOF
   >   F
   >  /|
   > E D B # replace: D -> B
   >  \|/
   >   A
   > EOF
 
   $ hg rebase -d B -s D
   note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
   rebasing 4:66f1a38021c9 "F" (F tip)
   $ hg log -G
   o    5:50e9d60b99c6 F
   |\
   | | x  4:66f1a38021c9 F
   | |/|
   | o |  3:7fb047a69f22 E
   | | |
   | | x  2:b18e25de2cf5 D
   | |/
   o |  1:112478962961 B
   |/
   o  0:426bada5c675 A
   
   $ cd ..
 
 Rebase merge where successor of other parent is equal to destination
 
   $ hg init p2-succ-is-dest
   $ cd p2-succ-is-dest
 
   $ hg debugdrawdag <<EOF
   >   F
   >  /|
   > E D B # replace: E -> B
   >  \|/
   >   A
   > EOF
 
   $ hg rebase -d B -s E
   note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
   rebasing 4:66f1a38021c9 "F" (F tip)
   $ hg log -G
   o    5:aae1787dacee F
   |\
   | | x  4:66f1a38021c9 F
   | |/|
   | | x  3:7fb047a69f22 E
   | | |
   | o |  2:b18e25de2cf5 D
   | |/
   o /  1:112478962961 B
   |/
   o  0:426bada5c675 A
   
   $ cd ..
 
 Rebase merge where successor of one parent is ancestor of destination
 
   $ hg init p1-succ-in-dest
   $ cd p1-succ-in-dest
 
   $ hg debugdrawdag <<EOF
   >   F C
   >  /| |
   > E D B # replace: D -> B
   >  \|/
   >   A
   > EOF
 
   $ hg rebase -d C -s D
   note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
   rebasing 5:66f1a38021c9 "F" (F tip)
 
   $ hg log -G
   o    6:0913febf6439 F
   |\
   +---x  5:66f1a38021c9 F
   | | |
   | o |  4:26805aba1e60 C
   | | |
   o | |  3:7fb047a69f22 E
   | | |
   +---x  2:b18e25de2cf5 D
   | |
   | o  1:112478962961 B
   |/
   o  0:426bada5c675 A
   
   $ cd ..
 
 Rebase merge where successor of other parent is ancestor of destination
 
   $ hg init p2-succ-in-dest
   $ cd p2-succ-in-dest
 
   $ hg debugdrawdag <<EOF
   >   F C
   >  /| |
   > E D B # replace: E -> B
   >  \|/
   >   A
   > EOF
 
   $ hg rebase -d C -s E
   note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
   rebasing 5:66f1a38021c9 "F" (F tip)
   $ hg log -G
   o    6:c6ab0cc6d220 F
   |\
   +---x  5:66f1a38021c9 F
   | | |
   | o |  4:26805aba1e60 C
   | | |
   | | x  3:7fb047a69f22 E
   | | |
   o---+  2:b18e25de2cf5 D
    / /
   o /  1:112478962961 B
   |/
   o  0:426bada5c675 A
   
   $ cd ..
 
 Rebase merge where successor of one parent is ancestor of destination
 
   $ hg init p1-succ-in-dest-b
   $ cd p1-succ-in-dest-b
 
   $ hg debugdrawdag <<EOF
   >   F C
   >  /| |
   > E D B # replace: E -> B
   >  \|/
   >   A
   > EOF
 
   $ hg rebase -d C -b F
   rebasing 2:b18e25de2cf5 "D" (D)
   note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
   rebasing 5:66f1a38021c9 "F" (F tip)
   note: rebase of 5:66f1a38021c9 created no changes to commit
   $ hg log -G
   o  6:8f47515dda15 D
   |
   | x    5:66f1a38021c9 F
   | |\
   o | |  4:26805aba1e60 C
   | | |
   | | x  3:7fb047a69f22 E
   | | |
   | x |  2:b18e25de2cf5 D
   | |/
   o /  1:112478962961 B
   |/
   o  0:426bada5c675 A
   
   $ cd ..
 
 Rebase merge where successor of other parent is ancestor of destination
 
   $ hg init p2-succ-in-dest-b
   $ cd p2-succ-in-dest-b
 
   $ hg debugdrawdag <<EOF
   >   F C
   >  /| |
   > E D B # replace: D -> B
   >  \|/
   >   A
   > EOF
 
   $ hg rebase -d C -b F
   note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
   rebasing 3:7fb047a69f22 "E" (E)
   rebasing 5:66f1a38021c9 "F" (F tip)
   note: rebase of 5:66f1a38021c9 created no changes to commit
 
   $ hg log -G
   o  6:533690786a86 E
   |
   | x    5:66f1a38021c9 F
   | |\
   o | |  4:26805aba1e60 C
   | | |
   | | x  3:7fb047a69f22 E
   | | |
   | x |  2:b18e25de2cf5 D
   | |/
   o /  1:112478962961 B
   |/
   o  0:426bada5c675 A
   
   $ cd ..
 
 Rebase merge where both parents have successors in destination
 
   $ hg init p12-succ-in-dest
   $ cd p12-succ-in-dest
   $ hg debugdrawdag <<'EOS'
   >   E   F
   >  /|  /|  # replace: A -> C
   > A B C D  # replace: B -> D
   > | |
   > X Y
   > EOS
   $ hg rebase -r A+B+E -d F
   note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C)
   note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D)
   rebasing 7:dac5d11c5a7d "E" (E tip)
   abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f
   [255]
   $ cd ..
 
 Rebase a non-clean merge. One parent has successor in destination, the other
 parent moves as requested.
 
   $ hg init p1-succ-p2-move
   $ cd p1-succ-p2-move
   $ hg debugdrawdag <<'EOS'
   >   D Z
   >  /| | # replace: A -> C
   > A B C # D/D = D
   > EOS
   $ hg rebase -r A+B+D -d Z
   note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C" (C)
   rebasing 1:fc2b737bb2e5 "B" (B)
   rebasing 3:b8ed089c80ad "D" (D)
 
   $ rm .hg/localtags
   $ hg log -G
   o  6:e4f78693cc88 D
   |
   o  5:76840d832e98 B
   |
   o  4:50e41c1f3950 Z
   |
   o  2:96cc3511f894 C
   
   $ hg files -r tip
   B
   C
   D
   Z
 
   $ cd ..
 
   $ hg init p1-move-p2-succ
   $ cd p1-move-p2-succ
   $ hg debugdrawdag <<'EOS'
   >   D Z
   >  /| |  # replace: B -> C
   > A B C  # D/D = D
   > EOS
   $ hg rebase -r B+A+D -d Z
   rebasing 0:426bada5c675 "A" (A)
   note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C" (C)
   rebasing 3:b8ed089c80ad "D" (D)
 
   $ rm .hg/localtags
   $ hg log -G
   o  6:1b355ed94d82 D
   |
   o  5:a81a74d764a6 A
   |
   o  4:50e41c1f3950 Z
   |
   o  2:96cc3511f894 C
   
   $ hg files -r tip
   A
   C
   D
   Z
 
   $ cd ..
 
 Test that bookmark is moved and working dir is updated when all changesets have
 equivalents in destination
   $ hg init rbsrepo && cd rbsrepo
   $ echo "[experimental]" > .hg/hgrc
   $ echo "evolution=true" >> .hg/hgrc
   $ echo "rebaseskipobsolete=on" >> .hg/hgrc
   $ echo root > root && hg ci -Am root
   adding root
   $ echo a > a && hg ci -Am a
   adding a
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b > b && hg ci -Am b
   adding b
   created new head
   $ hg rebase -r 2 -d 1
   rebasing 2:1e9a3c00cbe9 "b" (tip)
   $ hg log -r .  # working dir is at rev 3 (successor of 2)
   3:be1832deae9a b (no-eol)
   $ hg book -r 2 mybook --hidden  # rev 2 has a bookmark on it now
   $ hg up 2 && hg log -r .  # working dir is at rev 2 again
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   2:1e9a3c00cbe9 b (no-eol)
   $ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1
   note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip)
 Check that working directory and bookmark was updated to rev 3 although rev 2
 was skipped
   $ hg log -r .
   3:be1832deae9a b (no-eol)
   $ hg bookmarks
      mybook                    3:be1832deae9a
   $ hg debugobsolete --rev tip
   1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
 
 Obsoleted working parent and bookmark could be moved if an ancestor of working
 parent gets moved:
 
   $ hg init $TESTTMP/ancestor-wd-move
   $ cd $TESTTMP/ancestor-wd-move
   $ hg debugdrawdag <<'EOS'
   >  E D1  # rebase: D1 -> D2
   >  | |
   >  | C
   > D2 |
   >  | B
   >  |/
   >  A
   > EOS
   $ hg update D1 -q
   $ hg bookmark book -i
   $ hg rebase -r B+D1 -d E
   rebasing 1:112478962961 "B" (B)
   note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2)
   $ hg log -G -T '{desc} {bookmarks}'
   @  B book
   |
   | x  D1
   | |
   o |  E
   | |
   | o  C
   | |
   o |  D2
   | |
   | x  B
   |/
   o  A
   
 Rebasing a merge with one of its parent having a hidden successor
 
   $ hg init $TESTTMP/merge-p1-hidden-successor
   $ cd $TESTTMP/merge-p1-hidden-successor
 
   $ hg debugdrawdag <<'EOS'
   >  E
   >  |
   > B3 B2 # amend: B1 -> B2 -> B3
   >  |/   # B2 is hidden
   >  |  D
   >  |  |\
   >  | B1 C
   >  |/
   >  A
   > EOS
 
   $ eval `hg tags -T '{tag}={node}\n'`
   $ rm .hg/localtags
 
   $ hg rebase -r $D -d $E
   rebasing 5:9e62094e4d94 "D"
 
   $ hg log -G
   o    7:a699d059adcf D
   |\
   | o  6:ecc93090a95c E
   | |
   | o  4:0dc878468a23 B3
   | |
   o |  1:96cc3511f894 C
    /
   o  0:426bada5c675 A
   
 For some reasons (--hidden, rebaseskipobsolete=0, directaccess, etc.),
 rebasestate may contain hidden hashes. "rebase --abort" should work regardless.
 
   $ hg init $TESTTMP/hidden-state1
   $ cd $TESTTMP/hidden-state1
   $ cat >> .hg/hgrc <<EOF
   > [experimental]
   > rebaseskipobsolete=0
   > EOF
 
   $ hg debugdrawdag <<'EOS'
   >    C
   >    |
   >  D B # prune: B, C
   >  |/  # B/D=B
   >  A
   > EOS
 
   $ eval `hg tags -T '{tag}={node}\n'`
   $ rm .hg/localtags
 
   $ hg update -q $C --hidden
   $ hg rebase -s $B -d $D
   rebasing 1:2ec65233581b "B"
   merging D
   warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
   $ cp -R . $TESTTMP/hidden-state2
 
   $ hg log -G
   @  2:b18e25de2cf5 D
   |
   | @  1:2ec65233581b B
   |/
   o  0:426bada5c675 A
   
   $ hg summary
   parent: 2:b18e25de2cf5 tip
    D
   parent: 1:2ec65233581b  (obsolete)
    B
   branch: default
   commit: 2 modified, 1 unknown, 1 unresolved (merge)
   update: (current)
   phases: 3 draft
   rebase: 0 rebased, 2 remaining (rebase --continue)
 
   $ hg rebase --abort
   rebase aborted
 
 Also test --continue for the above case
 
   $ cd $TESTTMP/hidden-state2
   $ hg resolve -m
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
   rebasing 1:2ec65233581b "B"
   rebasing 3:7829726be4dc "C" (tip)
   $ hg log -G
   @  5:1964d5d5b547 C
   |
   o  4:68deb90c12a2 B
   |
   o  2:b18e25de2cf5 D
   |
   o  0:426bada5c675 A
   

tests/test-rebase-partial.t

@@ -1,95 +1,95 b''
 Tests rebasing with part of the rebase set already in the
 destination (issue5422)
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > rebase=
   > drawdag=$TESTDIR/drawdag.py
   > 
   > [experimental]
-  > evolution=allowunstable
   > evolution.createmarkers=True
+  > evolution.allowunstable=True
   > 
   > [alias]
   > tglog = log -G --template "{rev}: {desc}"
   > EOF
 
   $ rebasewithdag() {
   >   N=`$PYTHON -c "print($N+1)"`
   >   hg init repo$N && cd repo$N
   >   hg debugdrawdag
   >   hg rebase "$@" > _rebasetmp
   >   r=$?
   >   grep -v 'saved backup bundle' _rebasetmp
   >   [ $r -eq 0 ] && hg tglog
   >   cd ..
   >   return $r
   > }
 
 Rebase two commits, of which one is already in the right place
 
   $ rebasewithdag -r C+D -d B <<EOF
   > C
   > |
   > B D
   > |/
   > A
   > EOF
   rebasing 2:b18e25de2cf5 "D" (D)
   already rebased 3:26805aba1e60 "C" (C tip)
   o  4: D
   |
   | o  3: C
   |/
   | x  2: D
   | |
   o |  1: B
   |/
   o  0: A
   
 Can collapse commits even if one is already in the right place
 
   $ rebasewithdag --collapse -r C+D -d B <<EOF
   > C
   > |
   > B D
   > |/
   > A
   > EOF
   rebasing 2:b18e25de2cf5 "D" (D)
   rebasing 3:26805aba1e60 "C" (C tip)
   o  4: Collapsed revision
   |  * D
   |  * C
   | x  3: C
   |/
   | x  2: D
   | |
   o |  1: B
   |/
   o  0: A
   
 Rebase with "holes". The commits after the hole should end up on the parent of
 the hole (B below), not on top of the destination (A).
 
   $ rebasewithdag -r B+D -d A <<EOF
   > D
   > |
   > C
   > |
   > B
   > |
   > A
   > EOF
   already rebased 1:112478962961 "B" (B)
   rebasing 3:f585351a92f8 "D" (D tip)
   o  4: D
   |
   | x  3: D
   | |
   | o  2: C
   |/
   o  1: B
   |
   o  0: A
   

tests/test-uncommit.t

@@ -1,385 +1,385 b''
 Test uncommit - set up the config
 
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
-  > evolution=allowunstable
   > evolution.createmarkers=True
+  > evolution.allowunstable=True
   > [extensions]
   > uncommit =
   > drawdag=$TESTDIR/drawdag.py
   > EOF
 
 Build up a repo
 
   $ hg init repo
   $ cd repo
   $ hg bookmark foo
 
 Help for uncommit
 
   $ hg help uncommit
   hg uncommit [OPTION]... [FILE]...
   
   uncommit part or all of a local changeset
   
       This command undoes the effect of a local commit, returning the affected
       files to their uncommitted state. This means that files modified or
       deleted in the changeset will be left unchanged, and so will remain
       modified in the working directory.
   
   (use 'hg help -e uncommit' to show help for the uncommit extension)
   
   options ([+] can be repeated):
   
       --keep                allow an empty commit after uncommiting
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
   
   (some details hidden, use --verbose to show complete help)
 
 Uncommit with no commits should fail
 
   $ hg uncommit
   abort: cannot uncommit null changeset
   [255]
 
 Create some commits
 
   $ touch files
   $ hg add files
   $ for i in a ab abc abcd abcde; do echo $i > files; echo $i > file-$i; hg add file-$i; hg commit -m "added file-$i"; done
   $ ls
   file-a
   file-ab
   file-abc
   file-abcd
   file-abcde
   files
 
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @  4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
   |
   o  3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
   |
   o  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
   |
   o  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
   |
   o  0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
   
 Simple uncommit off the top, also moves bookmark
 
   $ hg bookmark
    * foo                       4:6c4fd43ed714
   $ hg uncommit
   $ hg status
   M files
   A file-abcde
   $ hg bookmark
    * foo                       3:6db330d65db4
 
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   x  4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
   |
   @  3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
   |
   o  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
   |
   o  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
   |
   o  0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
   
 
 Recommit
 
   $ hg commit -m 'new change abcde'
   $ hg status
   $ hg heads -T '{rev}:{node} {desc}'
   5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde (no-eol)
 
 Uncommit of non-existent and unchanged files has no effect
   $ hg uncommit nothinghere
   nothing to uncommit
   [1]
   $ hg status
   $ hg uncommit file-abc
   nothing to uncommit
   [1]
   $ hg status
 
 Try partial uncommit, also moves bookmark
 
   $ hg bookmark
    * foo                       5:0c07a3ccda77
   $ hg uncommit files
   $ hg status
   M files
   $ hg bookmark
    * foo                       6:3727deee06f7
   $ hg heads -T '{rev}:{node} {desc}'
   6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde (no-eol)
   $ hg log -r . -p -T '{rev}:{node} {desc}'
   6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcdediff -r 6db330d65db4 -r 3727deee06f7 file-abcde
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file-abcde	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +abcde
   
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @  6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
   |
   | x  5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
   |/
   | x  4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
   |/
   o  3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
   |
   o  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
   |
   o  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
   |
   o  0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
   
   $ hg commit -m 'update files for abcde'
 
 Uncommit with dirty state
 
   $ echo "foo" >> files
   $ cat files
   abcde
   foo
   $ hg status
   M files
   $ hg uncommit
   abort: uncommitted changes
   [255]
   $ hg uncommit files
   $ cat files
   abcde
   foo
   $ hg commit -m "files abcde + foo"
 
 Testing the 'experimental.uncommitondirtywdir' config
 
   $ echo "bar" >> files
   $ hg uncommit
   abort: uncommitted changes
   [255]
   $ hg uncommit --config experimental.uncommitondirtywdir=True
   $ hg commit -m "files abcde + foo"
 
 Uncommit in the middle of a stack, does not move bookmark
 
   $ hg checkout '.^^^'
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   (leaving bookmark foo)
   $ hg log -r . -p -T '{rev}:{node} {desc}'
   2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abcdiff -r 69a232e754b0 -r abf2df566fc1 file-abc
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file-abc	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +abc
   diff -r 69a232e754b0 -r abf2df566fc1 files
   --- a/files	Thu Jan 01 00:00:00 1970 +0000
   +++ b/files	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -ab
   +abc
   
   $ hg bookmark
      foo                       9:48e5bd7cd583
   $ hg uncommit
   $ hg status
   M files
   A file-abc
   $ hg heads -T '{rev}:{node} {desc}'
   9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo (no-eol)
   $ hg bookmark
      foo                       9:48e5bd7cd583
   $ hg commit -m 'new abc'
   created new head
 
 Partial uncommit in the middle, does not move bookmark
 
   $ hg checkout '.^'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -r . -p -T '{rev}:{node} {desc}'
   1:69a232e754b08d568c4899475faf2eb44b857802 added file-abdiff -r 3004d2d9b508 -r 69a232e754b0 file-ab
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file-ab	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +ab
   diff -r 3004d2d9b508 -r 69a232e754b0 files
   --- a/files	Thu Jan 01 00:00:00 1970 +0000
   +++ b/files	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -a
   +ab
   
   $ hg bookmark
      foo                       9:48e5bd7cd583
   $ hg uncommit file-ab
   $ hg status
   A file-ab
 
   $ hg heads -T '{rev}:{node} {desc}\n'
   11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
   10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
   9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
 
   $ hg bookmark
      foo                       9:48e5bd7cd583
   $ hg commit -m 'update ab'
   $ hg status
   $ hg heads -T '{rev}:{node} {desc}\n'
   12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
   10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
   9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
 
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @  12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
   |
   o  11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
   |
   | o  10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
   | |
   | | o  9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
   | | |
   | | | x  8:83815831694b1271e9f207cb1b79b2b19275edcb files abcde + foo
   | | |/
   | | | x  7:0977fa602c2fd7d8427ed4e7ee15ea13b84c9173 update files for abcde
   | | |/
   | | o  6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
   | | |
   | | | x  5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
   | | |/
   | | | x  4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
   | | |/
   | | o  3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
   | | |
   | | x  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
   | |/
   | x  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
   |/
   o  0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
   
 Uncommit with draft parent
 
   $ hg uncommit
   $ hg phase -r .
   11: draft
   $ hg commit -m 'update ab again'
 
 Uncommit with public parent
 
   $ hg phase -p "::.^"
   $ hg uncommit
   $ hg phase -r .
   11: public
 
 Partial uncommit with public parent
 
   $ echo xyz > xyz
   $ hg add xyz
   $ hg commit -m "update ab and add xyz"
   $ hg uncommit xyz
   $ hg status
   A xyz
   $ hg phase -r .
   15: draft
   $ hg phase -r ".^"
   11: public
 
 Uncommit leaving an empty changeset
 
   $ cd $TESTTMP
   $ hg init repo1
   $ cd repo1
   $ hg debugdrawdag <<'EOS'
   > Q
   > |
   > P
   > EOS
   $ hg up Q -q
   $ hg uncommit --keep
   $ hg log -G -T '{desc} FILES: {files}'
   @  Q FILES:
   |
   | x  Q FILES: Q
   |/
   o  P FILES: P
   
   $ hg status
   A Q
 
   $ cd ..
   $ rm -rf repo1
 
 Testing uncommit while merge
 
   $ hg init repo2
   $ cd repo2
 
 Create some history
 
   $ touch a
   $ hg add a
   $ for i in 1 2 3; do echo $i > a; hg commit -m "a $i"; done
   $ hg checkout 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ touch b
   $ hg add b
   $ for i in 1 2 3; do echo $i > b; hg commit -m "b $i"; done
   created new head
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @  5:2cd56cdde163ded2fbb16ba2f918c96046ab0bf2 b 3
   |
   o  4:c3a0d5bb3b15834ffd2ef9ef603e93ec65cf2037 b 2
   |
   o  3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1
   |
   | o  2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3
   | |
   | o  1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2
   |/
   o  0:ea4e33293d4d274a2ba73150733c2612231f398c a 1
   
 
 Add and expect uncommit to fail on both merge working dir and merge changeset
 
   $ hg merge 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg uncommit
   abort: outstanding uncommitted merge
   [255]
 
   $ hg uncommit --config experimental.uncommitondirtywdir=True
   abort: cannot uncommit while merging
   [255]
 
   $ hg status
   M a
   $ hg commit -m 'merge a and b'
 
   $ hg uncommit
   abort: cannot uncommit merge changeset
   [255]
 
   $ hg status
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @    6:c03b9c37bc67bf504d4912061cfb527b47a63c6e merge a and b
   |\
   | o  5:2cd56cdde163ded2fbb16ba2f918c96046ab0bf2 b 3
   | |
   | o  4:c3a0d5bb3b15834ffd2ef9ef603e93ec65cf2037 b 2
   | |
   | o  3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1
   | |
   o |  2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3
   | |
   o |  1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2
   |/
   o  0:ea4e33293d4d274a2ba73150733c2612231f398c a 1