mercurial: comparison tests/test-histedit-commute.t

equal deleted inserted replaced

-:b0865b5919c6
+:11c076786d56
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 show the edit commands offered
 $ HGEDITOR=cat hg histedit 177f92b77385
 pick 177f92b77385 2 c
 pick 055a42cdd887 3 d
 pick e860deea161a 4 e
 #  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 customization of revision summary
+$ HGEDITOR=cat hg histedit 177f92b77385 \
+>  --config histedit.summary-template='I am rev {rev} desc {desc} tags {tags}'
+pick 177f92b77385 I am rev 2 desc c tags
+pick 055a42cdd887 I am rev 3 desc d tags
+pick e860deea161a I am rev 4 desc e tags
+pick 652413bf663e I am rev 5 desc f tags tip
+# Edit history between 177f92b77385 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
+#
 edit the history
 (use a hacky editor to check histedit-last-edit.txt backup)
 $ EDITED="$TESTTMP/editedhistory"
 $ cat > $EDITED <<EOF
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 put things back
 $ hg histedit 177f92b77385 --commands - 2>&1 << EOF | fixbundle
 > pick 177f92b77385 c
 > pick 07114f51870f d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 slightly different this time
 $ hg histedit 177f92b77385 --commands - << EOF 2>&1 | fixbundle
 > pick 10517e47bbbb d
 > pick 7eca9b5b1148 f
 o  changeset:   0:cb9a9f314b8b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 keep prevents stripping dead revs
 $ hg histedit 799205341b6b --keep --commands - 2>&1 << EOF | fixbundle
 > pick 799205341b6b d
 > pick be9ae3a309c6 f
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 try with --rev
 $ hg histedit --commands - --rev -2 2>&1 <<EOF | fixbundle
 > pick de71b079d9ce e
 > pick 38b92f448761 c
 > EOF
 o  changeset:   0:cb9a9f314b8b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 Verify that revsetalias entries work with histedit:
 $ cat >> $HGRCPATH <<EOF
 > [revsetalias]
 > grandparent(ARG) = p1(p1(ARG))
 > EOF
 #  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
 #
 should also work if a commit message is missing
 $ BUNDLE="$TESTDIR/missing-comment.hg"
 $ hg init missing
 $ cd missing
 o  changeset:   0:141947992243
 user:        Robert Altman <robert.altman@telventDTN.com>
 date:        Mon Nov 28 16:35:28 2011 +0000
 summary:     Checked in text file
 $ hg histedit 0
 $ cd ..
 $ cd ..
 --- /dev/null
 +++ b/another-dir/initial-file
 @@ -0,0 +1,1 @@
 +changed
 $ hg --config diff.git=yes export 1
 # HG changeset patch
 # User test
 # Date 0 0
 #      Thu Jan 01 00:00:00 1970 +0000
 renamed
 diff --git a/another-dir/initial-file b/another-dir/renamed-file
 rename from another-dir/initial-file
 rename to another-dir/renamed-file
 $ cd ..
 Test that branches are preserved and stays active
 -------------------------------------------------

changeset 41509	11c076786d56
parent 39480	89630d0b3e23
child 45857	ec6ba70be853