gitweb: Add git_merge sub
[git/gsoc2010-gitweb.git] / t / lib-rebase.sh
blob6aefe27593e89d57f075bc0d3dbc5a1104d874b7
1 #!/bin/sh
3 # After setting the fake editor with this function, you can
5 # - override the commit message with $FAKE_COMMIT_MESSAGE
6 # - amend the commit message with $FAKE_COMMIT_AMEND
7 # - check that non-commit messages have a certain line count with $EXPECT_COUNT
8 # - check the commit count in the commit message header with $EXPECT_HEADER_COUNT
9 # - rewrite a rebase -i script as directed by $FAKE_LINES.
10 # $FAKE_LINES consists of a sequence of words separated by spaces.
11 # The following word combinations are possible:
13 # "<lineno>" -- add a "pick" line with the SHA1 taken from the
14 # specified line.
16 # "<cmd> <lineno>" -- add a line with the specified command
17 # ("squash", "fixup", "edit", or "reword") and the SHA1 taken
18 # from the specified line.
20 # "#" -- Add a comment line.
22 # ">" -- Add a blank line.
24 set_fake_editor () {
25 echo "#!$SHELL_PATH" >fake-editor.sh
26 cat >> fake-editor.sh <<\EOF
27 case "$1" in
28 */COMMIT_EDITMSG)
29 test -z "$EXPECT_HEADER_COUNT" ||
30 test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" ||
31 exit
32 test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
33 test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
34 exit
36 esac
37 test -z "$EXPECT_COUNT" ||
38 test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
39 exit
40 test -z "$FAKE_LINES" && exit
41 grep -v '^#' < "$1" > "$1".tmp
42 rm -f "$1"
43 echo 'rebase -i script before editing:'
44 cat "$1".tmp
45 action=pick
46 for line in $FAKE_LINES; do
47 case $line in
48 squash|fixup|edit|reword)
49 action="$line";;
50 "#")
51 echo '# comment' >> "$1";;
52 ">")
53 echo >> "$1";;
55 sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
56 action=pick;;
57 esac
58 done
59 echo 'rebase -i script after editing:'
60 cat "$1"
61 EOF
63 test_set_editor "$(pwd)/fake-editor.sh"
64 chmod a+x fake-editor.sh