diff tests/test-histedit-fold-non-commute @ 17064:168cc52ad7c2

histedit: new extension for interactive history editing

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-histedit-fold-non-commute	Wed Jun 27 17:52:54 2012 -0500
@@ -0,0 +1,65 @@
+#!/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
+fold bfa474341cc9 does not commute with e
+pick 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
+    echo a >> e
+    hg ci -m 'does not commute with e'
+}
+
+initrepo
+
+echo % log before edit
+hg log --graph
+
+echo % edit the history
+HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle
+
+echo % fix up
+echo a > e
+hg add e
+cat > cat.py <<EOF
+import sys
+print open(sys.argv[1]).read()
+print
+print
+EOF
+HGEDITOR="python cat.py" hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
+
+echo
+echo % just continue this time
+hg histedit --continue 2>&1 | fixbundle
+
+
+echo % log after edit
+hg log --graph
+
+echo % contents of e
+hg cat e
+
+echo % manifest
+hg manifest
+
+echo % EOF