diff --git a/tests/test-mq-qrefresh-replace-log-message.out b/tests/test-mq-qrefresh-replace-log-message.out deleted file mode 100644 index 05e1171cf4cabc52e48295fc625c4cc992e2431b_dGVzdHMvdGVzdC1tcS1xcmVmcmVzaC1yZXBsYWNlLWxvZy1tZXNzYWdlLm91dA==..0000000000000000000000000000000000000000 --- a/tests/test-mq-qrefresh-replace-log-message.out +++ /dev/null @@ -1,33 +0,0 @@ -======================= -Should fail if no patches applied -no patches applied -no patches applied -======================= -Should display 'First commit message' -description: -First commit message - - - -======================= -Should display 'Second commit message' -description: -Second commit message - - - -======================= -Should display 'Third commit message\n This is the 3rd log message' -description: -Third commit message - This is the 3rd log message - - - -======================= -Should display 'Fifth commit message\n This is the 5th log message' -description: -Fifth commit message - - - diff --git a/tests/test-mq-qrefresh-replace-log-message b/tests/test-mq-qrefresh-replace-log-message.t old mode 100755 new mode 100644 similarity index 0% rename from tests/test-mq-qrefresh-replace-log-message rename to tests/test-mq-qrefresh-replace-log-message.t index 05e1171cf4cabc52e48295fc625c4cc992e2431b_dGVzdHMvdGVzdC1tcS1xcmVmcmVzaC1yZXBsYWNlLWxvZy1tZXNzYWdl..d8bf747d2e29bd659ca2c4b40be0757f3af5d4dc_dGVzdHMvdGVzdC1tcS1xcmVmcmVzaC1yZXBsYWNlLWxvZy1tZXNzYWdlLnQ= --- a/tests/test-mq-qrefresh-replace-log-message +++ b/tests/test-mq-qrefresh-replace-log-message.t @@ -1,2 +1,2 @@ -#!/bin/sh +Environement setup for MQ @@ -2,5 +2,6 @@ -# Environement setup for MQ -echo "[extensions]" >> $HGRCPATH -echo "mq=" >> $HGRCPATH + $ echo "[extensions]" >> $HGRCPATH + $ echo "mq=" >> $HGRCPATH + $ hg init + $ hg qinit @@ -6,5 +7,3 @@ -#Repo init -hg init -hg qinit +Should fail if no patches applied @@ -10,6 +9,12 @@ -echo ======================= -echo "Should fail if no patches applied" -hg qrefresh -hg qrefresh -e + $ hg qrefresh + no patches applied + [1] + $ hg qrefresh -e + no patches applied + [1] + $ hg qnew -m "First commit message" first-patch + $ echo aaaa > file + $ hg add file + $ hg qrefresh @@ -15,10 +20,11 @@ -hg qnew -m "First commit message" first-patch -echo aaaa > file -hg add file -hg qrefresh -echo ======================= -echo "Should display 'First commit message'" -hg log -l1 -v | sed -n '/description/,$p' -echo +Should display 'First commit message' + + $ hg log -l1 --template "{desc}\n" + First commit message + +Testing changing message with -m + + $ echo bbbb > file + $ hg qrefresh -m "Second commit message" @@ -24,9 +30,8 @@ -# Testing changing message with -m -echo bbbb > file -hg qrefresh -m "Second commit message" -echo ======================= -echo "Should display 'Second commit message'" -hg log -l1 -v | sed -n '/description/,$p' -echo +Should display 'Second commit message' + + $ hg log -l1 --template "{desc}\n" + Second commit message + +Testing changing message with -l @@ -32,2 +37,8 @@ + $ echo "Third commit message" > logfile + $ echo " This is the 3rd log message" >> logfile + $ echo bbbb > file + $ hg qrefresh -l logfile + +Should display 'Third commit message\\\n This is the 3rd log message' @@ -33,11 +44,7 @@ -# Testing changing message with -l -echo "Third commit message" > logfile -echo " This is the 3rd log message" >> logfile -echo bbbb > file -hg qrefresh -l logfile -echo ======================= -printf "Should display 'Third commit message\\\n This is the 3rd log message'\n" -hg log -l1 -v | sed -n '/description/,$p' -echo + $ hg log -l1 --template "{desc}\n" + Third commit message + This is the 3rd log message + +Testing changing message with -l- @@ -43,13 +50,12 @@ -# Testing changing message with -l- -hg qnew -m "First commit message" second-patch -echo aaaa > file2 -hg add file2 -echo bbbb > file2 -(echo "Fifth commit message" -echo " This is the 5th log message" >> logfile) |\ -hg qrefresh -l- -echo ======================= -printf "Should display 'Fifth commit message\\\n This is the 5th log message'\n" -hg log -l1 -v | sed -n '/description/,$p' -echo + $ hg qnew -m "First commit message" second-patch + $ echo aaaa > file2 + $ hg add file2 + $ echo bbbb > file2 + $ (echo "Fifth commit message"; echo " This is the 5th log message") | hg qrefresh -l- + +Should display 'Fifth commit message\\\n This is the 5th log message' + + $ hg log -l1 --template "{desc}\n" + Fifth commit message + This is the 5th log message