test-mq-header: don't fail with different patch(1)

At least under FreeBSD patch(1) won't fail on empty patch and will print
'Hmm...' warning instead. Sanitize output so tests won't fail unexpectedly.

tests/test-mq-header-date

@@ -1,178 +1,177 b''
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 echo "[diff]" >> $HGRCPATH
 echo "nodates=true" >> $HGRCPATH
 
 
 catpatch() {
     cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /"
 }
 
 catlog() {
     catpatch $1
     hg log --template "{rev}: {desc} - {author}\n"
 }
 
 catlogd() {
     catpatch $1
     hg log --template "{rev}: {desc} - {author} - {date}\n"
 }
 
 drop() {
     hg qpop
     hg qdel $1.patch
 }
 
 
 echo ==== init
 hg init a
 cd a
 hg qinit
 
 
 echo ==== qnew -d
 hg qnew -d '3 0' 1.patch
 catlogd 1
 
 echo ==== qref
 echo "1" >1
 hg add
 hg qref
 catlogd 1
 
 echo ==== qref -d
 hg qref -d '4 0'
 catlogd 1
 
 
 echo ==== qnew
 hg qnew 2.patch
 echo "2" >2
 hg add
 hg qref
 catlog 2
 
 echo ==== qref -d
 hg qref -d '5 0'
 catlog 2
 
 drop 2
 
 
 echo ==== qnew -d -m
 hg qnew -d '6 0' -m "Three" 3.patch
 catlogd 3
 
 echo ==== qref
 echo "3" >3
 hg add
 hg qref
 catlogd 3
 
 echo ==== qref -m
 hg qref -m "Drei"
 catlogd 3
 
 echo ==== qref -d
 hg qref -d '7 0'
 catlogd 3
 
 echo ==== qref -d -m
 hg qref -d '8 0' -m "Three (again)"
 catlogd 3
 
 
 echo ==== qnew -m
 hg qnew -m "Four" 4.patch
 echo "4" >4
 hg add
 hg qref
 catlog 4
 
 echo ==== qref -d
 hg qref -d '9 0'
 catlog 4
 
 drop 4
 
 
 echo ==== qnew with HG header
 hg qnew 5.patch
 hg qpop
 echo "# HG changeset patch" >>.hg/patches/5.patch
 echo "# Date 10 0" >>.hg/patches/5.patch
-# Drop patch specific error line
-hg qpush 2>&1 | grep -v garbage
+hg qpush 2>&1 | grep 'Now at'
 catlogd 5
 
 echo ==== hg qref
 echo "5" >5
 hg add
 hg qref
 catlogd 5
 
 echo ==== hg qref -d
 hg qref -d '11 0'
 catlogd 5
 
 
 echo ==== qnew -u
 hg qnew -u jane 6.patch
 echo "6" >6
 hg add
 hg qref
 catlog 6
 
 echo ==== qref -d
 hg qref -d '12 0'
 catlog 6
 
 drop 6
 
 
 echo ==== qnew -d
 hg qnew -d '13 0' 7.patch
 echo "7" >7
 hg add
 hg qref
 catlog 7
 
 echo ==== qref -u
 hg qref -u john
 catlogd 7
 
 
 echo ==== qnew
 hg qnew 8.patch
 echo "8" >8
 hg add
 hg qref
 catlog 8
 
 echo ==== qref -u -d
 hg qref -u john -d '14 0'
 catlog 8
 
 drop 8
 
 
 echo ==== qnew -m
 hg qnew -m "Nine" 9.patch
 echo "9" >9
 hg add
 hg qref
 catlog 9
 
 echo ==== qref -u -d
 hg qref -u john -d '15 0'
 catlog 9
 
 drop 9
 
 
 echo ==== "qpop -a / qpush -a"
 hg qpop -a
 hg qpush -a
 hg log --template "{rev}: {desc} - {author} - {date}\n"

tests/test-mq-header-date.out

@@ -1,287 +1,284 b''
 ==== init
 ==== qnew -d
 # HG changeset patch
 # Date 3 0
 
 0: [mq]: 1.patch - test - 3.00
 ==== qref
 adding 1
 # HG changeset patch
 # Date 3 0
 
 diff -r ... 1
 --- /dev/null
 +++ b/1
 @@ -0,0 +1,1 @@
 +1
 0: [mq]: 1.patch - test - 3.00
 ==== qref -d
 # HG changeset patch
 # Date 4 0
 
 diff -r ... 1
 --- /dev/null
 +++ b/1
 @@ -0,0 +1,1 @@
 +1
 0: [mq]: 1.patch - test - 4.00
 ==== qnew
 adding 2
 diff -r ... 2
 --- /dev/null
 +++ b/2
 @@ -0,0 +1,1 @@
 +2
 1: [mq]: 2.patch - test
 0: [mq]: 1.patch - test
 ==== qref -d
 diff -r ... 2
 --- /dev/null
 +++ b/2
 @@ -0,0 +1,1 @@
 +2
 1: [mq]: 2.patch - test
 0: [mq]: 1.patch - test
 Now at: 1.patch
 ==== qnew -d -m
 # HG changeset patch
 # Date 6 0
 
 Three
 1: Three - test - 6.00
 0: [mq]: 1.patch - test - 4.00
 ==== qref
 adding 3
 # HG changeset patch
 # Date 6 0
 
 Three
 
 diff -r ... 3
 --- /dev/null
 +++ b/3
 @@ -0,0 +1,1 @@
 +3
 1: Three - test - 6.00
 0: [mq]: 1.patch - test - 4.00
 ==== qref -m
 # HG changeset patch
 # Date 6 0
 
 Drei
 
 diff -r ... 3
 --- /dev/null
 +++ b/3
 @@ -0,0 +1,1 @@
 +3
 1: Drei - test - 6.00
 0: [mq]: 1.patch - test - 4.00
 ==== qref -d
 # HG changeset patch
 # Date 7 0
 
 Drei
 
 diff -r ... 3
 --- /dev/null
 +++ b/3
 @@ -0,0 +1,1 @@
 +3
 1: Drei - test - 7.00
 0: [mq]: 1.patch - test - 4.00
 ==== qref -d -m
 # HG changeset patch
 # Date 8 0
 
 Three (again)
 
 diff -r ... 3
 --- /dev/null
 +++ b/3
 @@ -0,0 +1,1 @@
 +3
 1: Three (again) - test - 8.00
 0: [mq]: 1.patch - test - 4.00
 ==== qnew -m
 adding 4
 Four
 
 diff -r ... 4
 --- /dev/null
 +++ b/4
 @@ -0,0 +1,1 @@
 +4
 2: Four - test
 1: Three (again) - test
 0: [mq]: 1.patch - test
 ==== qref -d
 Four
 
 diff -r ... 4
 --- /dev/null
 +++ b/4
 @@ -0,0 +1,1 @@
 +4
 2: Four - test
 1: Three (again) - test
 0: [mq]: 1.patch - test
 Now at: 3.patch
 ==== qnew with HG header
 Now at: 3.patch
-applying 5.patch
-patch failed, unable to continue (try -v)
-patch 5.patch is empty
 Now at: 5.patch
 # HG changeset patch
 # Date 10 0
 2: imported patch 5.patch - test - 10.00
 1: Three (again) - test - 8.00
 0: [mq]: 1.patch - test - 4.00
 ==== hg qref
 adding 5
 # HG changeset patch
 # Date 10 0
 
 diff -r ... 5
 --- /dev/null
 +++ b/5
 @@ -0,0 +1,1 @@
 +5
 2: [mq]: 5.patch - test - 10.00
 1: Three (again) - test - 8.00
 0: [mq]: 1.patch - test - 4.00
 ==== hg qref -d
 # HG changeset patch
 # Date 11 0
 
 diff -r ... 5
 --- /dev/null
 +++ b/5
 @@ -0,0 +1,1 @@
 +5
 2: [mq]: 5.patch - test - 11.00
 1: Three (again) - test - 8.00
 0: [mq]: 1.patch - test - 4.00
 ==== qnew -u
 adding 6
 From: jane
 
 diff -r ... 6
 --- /dev/null
 +++ b/6
 @@ -0,0 +1,1 @@
 +6
 3: [mq]: 6.patch - jane
 2: [mq]: 5.patch - test
 1: Three (again) - test
 0: [mq]: 1.patch - test
 ==== qref -d
 From: jane
 
 diff -r ... 6
 --- /dev/null
 +++ b/6
 @@ -0,0 +1,1 @@
 +6
 3: [mq]: 6.patch - jane
 2: [mq]: 5.patch - test
 1: Three (again) - test
 0: [mq]: 1.patch - test
 Now at: 5.patch
 ==== qnew -d
 adding 7
 # HG changeset patch
 # Date 13 0
 
 diff -r ... 7
 --- /dev/null
 +++ b/7
 @@ -0,0 +1,1 @@
 +7
 3: [mq]: 7.patch - test
 2: [mq]: 5.patch - test
 1: Three (again) - test
 0: [mq]: 1.patch - test
 ==== qref -u
 # HG changeset patch
 # User john
 # Date 13 0
 
 diff -r ... 7
 --- /dev/null
 +++ b/7
 @@ -0,0 +1,1 @@
 +7
 3: [mq]: 7.patch - john - 13.00
 2: [mq]: 5.patch - test - 11.00
 1: Three (again) - test - 8.00
 0: [mq]: 1.patch - test - 4.00
 ==== qnew
 adding 8
 diff -r ... 8
 --- /dev/null
 +++ b/8
 @@ -0,0 +1,1 @@
 +8
 4: [mq]: 8.patch - test
 3: [mq]: 7.patch - john
 2: [mq]: 5.patch - test
 1: Three (again) - test
 0: [mq]: 1.patch - test
 ==== qref -u -d
 From: john
 
 
 diff -r ... 8
 --- /dev/null
 +++ b/8
 @@ -0,0 +1,1 @@
 +8
 4: [mq]: 8.patch - john
 3: [mq]: 7.patch - john
 2: [mq]: 5.patch - test
 1: Three (again) - test
 0: [mq]: 1.patch - test
 Now at: 7.patch
 ==== qnew -m
 adding 9
 Nine
 
 diff -r ... 9
 --- /dev/null
 +++ b/9
 @@ -0,0 +1,1 @@
 +9
 4: Nine - test
 3: [mq]: 7.patch - john
 2: [mq]: 5.patch - test
 1: Three (again) - test
 0: [mq]: 1.patch - test
 ==== qref -u -d
 From: john
 
 Nine
 
 diff -r ... 9
 --- /dev/null
 +++ b/9
 @@ -0,0 +1,1 @@
 +9
 4: Nine - john
 3: [mq]: 7.patch - john
 2: [mq]: 5.patch - test
 1: Three (again) - test
 0: [mq]: 1.patch - test
 Now at: 7.patch
 ==== qpop -a / qpush -a
 Patch queue now empty
 applying 1.patch
 applying 3.patch
 applying 5.patch
 applying 7.patch
 Now at: 7.patch
 3: imported patch 7.patch - john - 13.00
 2: imported patch 5.patch - test - 11.00
 1: Three (again) - test - 8.00
 0: imported patch 1.patch - test - 4.00

tests/test-mq-header-from

@@ -1,108 +1,107 b''
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 echo "[diff]" >> $HGRCPATH
 echo "nodates=true" >> $HGRCPATH
 
 
 catlog() {
     cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /"
     hg log --template "{rev}: {desc} - {author}\n"
 }
 
 
 echo ==== init
 hg init a
 cd a
 hg qinit
 
 
 echo ==== qnew -U
 hg qnew -U 1.patch
 catlog 1
 
 echo ==== qref
 echo "1" >1
 hg add
 hg qref
 catlog 1
 
 echo ==== qref -u
 hg qref -u mary
 catlog 1
 
 echo ==== qnew
 hg qnew 2.patch
 echo "2" >2
 hg add
 hg qref
 catlog 2
 
 echo ==== qref -u
 hg qref -u jane
 catlog 2
 
 
 echo ==== qnew -U -m
 hg qnew -U -m "Three" 3.patch
 catlog 3
 
 echo ==== qref
 echo "3" >3
 hg add
 hg qref
 catlog 3
 
 echo ==== qref -m
 hg qref -m "Drei"
 catlog 3
 
 echo ==== qref -u
 hg qref -u mary
 catlog 3
 
 echo ==== qref -u -m
 hg qref -u maria -m "Three (again)"
 catlog 3
 
 echo ==== qnew -m
 hg qnew -m "Four" 4.patch
 echo "4" >4
 hg add
 hg qref
 catlog 4
 
 echo ==== qref -u
 hg qref -u jane
 catlog 4
 
 
 echo ==== qnew with HG header
 hg qnew 5.patch
 hg qpop
 echo "# HG changeset patch" >>.hg/patches/5.patch
 echo "# User johndoe" >>.hg/patches/5.patch
-# Drop patch specific error line
-hg qpush 2>&1 | grep -v garbage
+hg qpush 2>&1 | grep 'Now at'
 catlog 5
 
 echo ==== hg qref
 echo "5" >5
 hg add
 hg qref
 catlog 5
 
 echo ==== hg qref -U
 hg qref -U
 catlog 5
 
 echo ==== hg qref -u
 hg qref -u johndeere
 catlog 5
 
 
 echo ==== "qpop -a / qpush -a"
 hg qpop -a
 hg qpush -a
 hg log --template "{rev}: {desc} - {author}\n"

tests/test-mq-header-from.out

@@ -1,200 +1,197 b''
 ==== init
 ==== qnew -U
 From: test
 
 0: [mq]: 1.patch - test
 ==== qref
 adding 1
 From: test
 
 diff -r ... 1
 --- /dev/null
 +++ b/1
 @@ -0,0 +1,1 @@
 +1
 0: [mq]: 1.patch - test
 ==== qref -u
 From: mary
 
 diff -r ... 1
 --- /dev/null
 +++ b/1
 @@ -0,0 +1,1 @@
 +1
 0: [mq]: 1.patch - mary
 ==== qnew
 adding 2
 diff -r ... 2
 --- /dev/null
 +++ b/2
 @@ -0,0 +1,1 @@
 +2
 1: [mq]: 2.patch - test
 0: [mq]: 1.patch - mary
 ==== qref -u
 From: jane
 
 
 diff -r ... 2
 --- /dev/null
 +++ b/2
 @@ -0,0 +1,1 @@
 +2
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qnew -U -m
 From: test
 
 Three
 2: Three - test
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qref
 adding 3
 From: test
 
 Three
 
 diff -r ... 3
 --- /dev/null
 +++ b/3
 @@ -0,0 +1,1 @@
 +3
 2: Three - test
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qref -m
 From: test
 
 Drei
 
 diff -r ... 3
 --- /dev/null
 +++ b/3
 @@ -0,0 +1,1 @@
 +3
 2: Drei - test
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qref -u
 From: mary
 
 Drei
 
 diff -r ... 3
 --- /dev/null
 +++ b/3
 @@ -0,0 +1,1 @@
 +3
 2: Drei - mary
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qref -u -m
 From: maria
 
 Three (again)
 
 diff -r ... 3
 --- /dev/null
 +++ b/3
 @@ -0,0 +1,1 @@
 +3
 2: Three (again) - maria
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qnew -m
 adding 4
 Four
 
 diff -r ... 4
 --- /dev/null
 +++ b/4
 @@ -0,0 +1,1 @@
 +4
 3: Four - test
 2: Three (again) - maria
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qref -u
 From: jane
 
 Four
 
 diff -r ... 4
 --- /dev/null
 +++ b/4
 @@ -0,0 +1,1 @@
 +4
 3: Four - jane
 2: Three (again) - maria
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qnew with HG header
 Now at: 4.patch
-applying 5.patch
-patch failed, unable to continue (try -v)
-patch 5.patch is empty
 Now at: 5.patch
 # HG changeset patch
 # User johndoe
 4: imported patch 5.patch - johndoe
 3: Four - jane
 2: Three (again) - maria
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== hg qref
 adding 5
 # HG changeset patch
 # User johndoe
 
 diff -r ... 5
 --- /dev/null
 +++ b/5
 @@ -0,0 +1,1 @@
 +5
 4: [mq]: 5.patch - johndoe
 3: Four - jane
 2: Three (again) - maria
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== hg qref -U
 # HG changeset patch
 # User test
 
 diff -r ... 5
 --- /dev/null
 +++ b/5
 @@ -0,0 +1,1 @@
 +5
 4: [mq]: 5.patch - test
 3: Four - jane
 2: Three (again) - maria
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== hg qref -u
 # HG changeset patch
 # User johndeere
 
 diff -r ... 5
 --- /dev/null
 +++ b/5
 @@ -0,0 +1,1 @@
 +5
 4: [mq]: 5.patch - johndeere
 3: Four - jane
 2: Three (again) - maria
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qpop -a / qpush -a
 Patch queue now empty
 applying 1.patch
 applying 2.patch
 applying 3.patch
 applying 4.patch
 applying 5.patch
 Now at: 5.patch
 4: imported patch 5.patch - johndeere
 3: Four - jane
 2: Three (again) - maria
 1: imported patch 2.patch - jane
 0: imported patch 1.patch - mary