test-histedit-edit: improve coverage of histedit code

tests/test-histedit-edit

@@ -1,79 +1,80 b''
 #!/bin/sh
 
 . "$TESTDIR/histedit-helpers.sh"
 
 cat >> $HGRCPATH <<EOF
 [extensions]
 graphlog=
 histedit=
 EOF
 
 EDITED=`pwd`/editedhistory
 cat > $EDITED <<EOF
 pick 177f92b77385 c
 pick 055a42cdd887 d
 edit e860deea161a e
 pick 652413bf663e f
 EOF
 initrepo ()
 {
     hg init r
     cd r
     for x in a b c d e f ; do
         echo $x > $x
         hg add $x
         hg ci -m $x
     done
 }
 
 initrepo
 
 echo % log before edit
 hg log --graph
 
 echo % edit the history
 HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
 
-echo % edit the revision
+echo % commit, then edit the revision
+hg ci -m 'wat'
 echo a > e
 HGEDITOR='echo "foobaz" > ' hg histedit --continue 2>&1 | fixbundle
 
 hg log --graph
 
 echo '% contents of e:'
 hg cat e
 
 cat > $EDITED <<EOF
-edit c38516e9ed62 f
+edit bf757c081cd0 f
 EOF
 HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle
 hg status
 HGEDITOR='true' hg histedit --continue
 hg status
 
 echo % log after edit
 hg log --limit 1
 
 echo "% say we'll change the message, but don't."
 cat > ../edit.sh <<EOF
 #!/bin/sh
 cat \$1 | sed s/pick/mess/ > tmp
 mv tmp \$1
 EOF
 chmod +x ../edit.sh
 HGEDITOR="../edit.sh" hg histedit tip 2>&1 | fixbundle
 hg status
 hg log --limit 1
 
 echo % modify the message
 cat > $EDITED <<EOF
-mess c38516e9ed62 f
+mess bf757c081cd0 f
 EOF
 HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle
 hg status
 hg log --limit 1
 
 echo % rollback should not work after a histedit
 hg rollback
 
 echo % EOF

tests/test-histedit-edit.out

@@ -1,105 +1,111 b''
 % log before edit
 @  changeset:   5:652413bf663e
 |  tag:         tip
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     f
 |
 o  changeset:   4:e860deea161a
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     e
 |
 o  changeset:   3:055a42cdd887
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     d
 |
 o  changeset:   2:177f92b77385
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     c
 |
 o  changeset:   1:d2ae7f538514
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     b
 |
 o  changeset:   0:cb9a9f314b8b
    user:        test
    date:        Thu Jan 01 00:00:00 1970 +0000
    summary:     a
 
 % edit the history
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 abort: Make changes as needed, you may commit or record as needed now.
 When you are finished, run hg histedit --continue to resume.
-% edit the revision
+% commit, then edit the revision
+created new head
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-@  changeset:   5:c38516e9ed62
+@  changeset:   6:bf757c081cd0
 |  tag:         tip
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     f
 |
-o  changeset:   4:1da62d13177d
+o  changeset:   5:d6b15fed32d4
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     foobaz
 |
+o  changeset:   4:1a60820cd1f6
+|  user:        test
+|  date:        Thu Jan 01 00:00:00 1970 +0000
+|  summary:     wat
+|
 o  changeset:   3:055a42cdd887
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     d
 |
 o  changeset:   2:177f92b77385
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     c
 |
 o  changeset:   1:d2ae7f538514
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     b
 |
 o  changeset:   0:cb9a9f314b8b
    user:        test
    date:        Thu Jan 01 00:00:00 1970 +0000
    summary:     a
 
 % contents of e:
 a
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 abort: Make changes as needed, you may commit or record as needed now.
 When you are finished, run hg histedit --continue to resume.
 A f
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % log after edit
-changeset:   5:c38516e9ed62
+changeset:   6:bf757c081cd0
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     f
 
 % say we'll change the message, but don't.
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-changeset:   5:c38516e9ed62
+changeset:   6:bf757c081cd0
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     f
 
 % modify the message
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-changeset:   5:4d6a10bcf3e3
+changeset:   6:0b16746f8e89
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     mess c38516e9ed62 f
+summary:     mess bf757c081cd0 f
 
 % rollback should not work after a histedit
 no rollback information available
 % EOF