Patchwatcher status

Dan Kegel dank at
Sun Aug 17 10:29:57 CDT 2008

Patchwatcher falsely complained that
 [2/17] richedit: Removed assumption about the order of rtf indent
didn't apply because the regexp I used to detect
the end of a patch series falsely matched the
first patch in a series of 1x patches.  Here's the fix:

---     (revision 150)
+++     (working copy)
@@ -283,7 +283,7 @@
            cat $PATCHES/$NEXT.log
         # Use a regexp with a back reference to detect last patch in
a series and break out
-        if egrep -q 'Subject:.*[0-9]+/[0-9]+' $PATCHES/$NEXT.txt && !
egrep -q 'Subject:.*([0-9]+)/\1' $PATCHES/$NEXT.txt
+        if egrep -q 'Subject:.*[0-9]+/[0-9]+' $PATCHES/$NEXT.txt && !
egrep -q 'Subject:.*([0-9]+)/\1[^0-9]' $PATCHES/$NEXT.txt
             echo In middle of patch series, not wiping tree
             NEXT=`expr $NEXT + 1`

And it falsely complained that various of adam at's
patches failed because it didn't handle the case of multiple
patch series sent by the same author back to back and mixed
together by email delays.  Here's a fix:

---      (revision 150)
+++      (working copy)
@@ -147,7 +147,7 @@
        $series_num_patches = $num_patches;

-    if ($series_sender ne $sender) {
+    if ($series_sender ne $sender || $series_num_patches != $num_patches) {
         #print "Ignoring series for now, will try later; sender
$sender, num_patches $num_patches, subject
         # can't handle multiple series at once just yet, let it sit

That still won't handle the case of two patch series of the same length
being sent back to back by the same author, but that's
ambiguous enough that even humans might be confused,
so it should tide us over until I rewrite the patch series
detector to handle incomplete series better.

I'm on vacation so I can't apply these patches to the running instance,
I'll do it on tuesday.
- Dan

More information about the wine-devel mailing list