[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.4-210-gbe8d96a

Ruslan Zakirov ruz at bestpractical.com
Wed Jan 18 14:36:48 EST 2012


The branch, 4.0-trunk has been updated
       via  be8d96a231adc2b6f468e9b2afc3f446dcc1c096 (commit)
       via  d704839235ab7a756e80f057950960021c1373fa (commit)
       via  1c2b68522027c9996a53d55e02bfa0faad79ac7a (commit)
       via  05ac4dd87b780cac10dbb87d618995952d5a7f0e (commit)
      from  5b1379e92394c9e3fe33338e2fedb3f3c7d0787c (commit)

Summary of changes:
 share/html/Ticket/Elements/ShowMessageStanza |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 05ac4dd87b780cac10dbb87d618995952d5a7f0e
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Dec 23 17:32:12 2011 -0500

    Require at least one word character between hyphens when detecting Outlook's quoting
    
    This ensures that the following doesn't match:
    
         COLUMN A   COLUMN B
        ---------- ----------

diff --git a/share/html/Ticket/Elements/ShowMessageStanza b/share/html/Ticket/Elements/ShowMessageStanza
index 48634f0..feaf213 100755
--- a/share/html/Ticket/Elements/ShowMessageStanza
+++ b/share/html/Ticket/Elements/ShowMessageStanza
@@ -104,6 +104,7 @@ AGAIN: foreach ( ; $i < @$Message; $i++ ) {
                                             \s*         # whitespace varies between Outlook versions
                                                         # don't trigger on PGP signed message or signature blocks
                                             (?!(?:BEGIN|END)\s+PGP)
+                                            \w          # at least one word character
                                             [\w\s]+?    # words, loose to get different languages
                                             \s*         # whitespace varies between Outlook versions
                                             -{3,}       # at least three hyphens again

commit 1c2b68522027c9996a53d55e02bfa0faad79ac7a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Dec 23 17:40:19 2011 -0500

    Enforce that the "Original message" words are at least 5 characters long
    
    This heuristic works around false positives of the form:
    
          A        B
        ----- vs -----

diff --git a/share/html/Ticket/Elements/ShowMessageStanza b/share/html/Ticket/Elements/ShowMessageStanza
index feaf213..93be7c5 100755
--- a/share/html/Ticket/Elements/ShowMessageStanza
+++ b/share/html/Ticket/Elements/ShowMessageStanza
@@ -105,7 +105,8 @@ AGAIN: foreach ( ; $i < @$Message; $i++ ) {
                                                         # don't trigger on PGP signed message or signature blocks
                                             (?!(?:BEGIN|END)\s+PGP)
                                             \w          # at least one word character
-                                            [\w\s]+?    # words, loose to get different languages
+                                            [\w\s]{4,}? # the rest of the word(s), totalling at least 5 characters,
+                                                        #    loose to get different languages
                                             \s*         # whitespace varies between Outlook versions
                                             -{3,}       # at least three hyphens again
                                           |

commit d704839235ab7a756e80f057950960021c1373fa
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Dec 23 18:17:58 2011 -0500

    Require an ending word character to detect Outlook quoting styles
    
    This means "x   y" is valid between a set of hyphens but "x    " is not.

diff --git a/share/html/Ticket/Elements/ShowMessageStanza b/share/html/Ticket/Elements/ShowMessageStanza
index 93be7c5..fa9cbe4 100755
--- a/share/html/Ticket/Elements/ShowMessageStanza
+++ b/share/html/Ticket/Elements/ShowMessageStanza
@@ -105,8 +105,9 @@ AGAIN: foreach ( ; $i < @$Message; $i++ ) {
                                                         # don't trigger on PGP signed message or signature blocks
                                             (?!(?:BEGIN|END)\s+PGP)
                                             \w          # at least one word character
-                                            [\w\s]{4,}? # the rest of the word(s), totalling at least 5 characters,
+                                            [\w\s]{3,}? # the rest of the word(s), totalling at least 5 characters,
                                                         #    loose to get different languages
+                                            \w          # at least one ending word character
                                             \s*         # whitespace varies between Outlook versions
                                             -{3,}       # at least three hyphens again
                                           |

commit be8d96a231adc2b6f468e9b2afc3f446dcc1c096
Merge: 5b1379e d704839
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jan 18 23:36:24 2012 +0400

    Merge remote-tracking branch 'origin/4.0/stricter-outlook-folding' into 4.0-trunk


-----------------------------------------------------------------------


More information about the Rt-commit mailing list