From 54a4ca3d5a3fcb99e8dae216dcba25c9cc05a914 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 12 Sep 2008 10:14:12 +1000
Subject: [PATCH 01/16] Add 'Action Required' meta-state filter

This filter shows all patches in states with action_required = True.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/filters.py | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/apps/patchwork/filters.py b/apps/patchwork/filters.py
index 6cd526b..b0b204e 100644
--- a/apps/patchwork/filters.py
+++ b/apps/patchwork/filters.py
@@ -143,12 +143,23 @@ class SubmitterFilter(Filter):
 
 class StateFilter(Filter):
     param = 'state'
+    action_req_key = '!'
+
     def __init__(self, filters):
         super(StateFilter, self).__init__(filters)
         self.name = 'State'
         self.state = None
+        self.action_req = None
 
     def _set_key(self, str):
+        self.action_req = None
+        self.state = None
+
+        if str == self.action_req_key:
+            self.action_req = True
+            self.applied = True
+            return
+
         try:
             self.state = State.objects.get(id=int(str))
         except:
@@ -157,12 +168,24 @@ class StateFilter(Filter):
         self.applied = True
 
     def kwargs(self):
-        return {'state': self.state}
+        if self.action_req == True:
+            return {'state__in': \
+                        State.objects.filter(action_required = True) \
+                            .values('pk').query}
+        if self.state is not None:
+            return {'state': self.state}
 
     def condition(self):
-        return self.state.name
+        if self.state:
+            return self.state.name
+        elif self.action_req == True:
+            return 'Action Required'
+        return None
+
 
     def key(self):
+        if self.action_req == True:
+            return self.action_req_key
         if self.state is None:
             return None
         return self.state.id
@@ -170,6 +193,9 @@ class StateFilter(Filter):
     def _form(self):
         str = '<select name="%s">' % self.param
         str += '<option value="">any</option>'
+        if self.action_req_key:
+            str += '<option value="%s">Action Required</option>' % \
+                   self.action_req_key
         for state in State.objects.all():
             selected = ''
             if self.state and self.state == state:
-- 
2.39.2


From f81cf5f538934611bedb6ea6bfdabc31c764c7ea Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 12 Sep 2008 10:28:02 +1000
Subject: [PATCH 02/16] Make state = Action Required a default filter

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/filters.py | 44 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps/patchwork/filters.py b/apps/patchwork/filters.py
index b0b204e..4b29bc9 100644
--- a/apps/patchwork/filters.py
+++ b/apps/patchwork/filters.py
@@ -143,21 +143,20 @@ class SubmitterFilter(Filter):
 
 class StateFilter(Filter):
     param = 'state'
-    action_req_key = '!'
+    any_key = '*'
+    action_req_str = 'Action Required'
 
     def __init__(self, filters):
         super(StateFilter, self).__init__(filters)
         self.name = 'State'
         self.state = None
-        self.action_req = None
+        self.applied = True
 
     def _set_key(self, str):
-        self.action_req = None
         self.state = None
 
-        if str == self.action_req_key:
-            self.action_req = True
-            self.applied = True
+        if str == self.any_key:
+            self.applied = False
             return
 
         try:
@@ -168,34 +167,29 @@ class StateFilter(Filter):
         self.applied = True
 
     def kwargs(self):
-        if self.action_req == True:
+        if self.state is not None:
+            return {'state': self.state}
+        else:
             return {'state__in': \
                         State.objects.filter(action_required = True) \
                             .values('pk').query}
-        if self.state is not None:
-            return {'state': self.state}
 
     def condition(self):
         if self.state:
             return self.state.name
-        elif self.action_req == True:
-            return 'Action Required'
-        return None
-
+        return self.action_req_str
 
     def key(self):
-        if self.action_req == True:
-            return self.action_req_key
-        if self.state is None:
-            return None
-        return self.state.id
+        if self.state is not None:
+            return self.state.id
+        if not self.applied:
+            return '*'
+        return None
 
     def _form(self):
         str = '<select name="%s">' % self.param
-        str += '<option value="">any</option>'
-        if self.action_req_key:
-            str += '<option value="%s">Action Required</option>' % \
-                   self.action_req_key
+        str += '<option value="%s">any</option>' % self.any_key
+        str += '<option value="">%s</option>' % self.action_req_str
         for state in State.objects.all():
             selected = ''
             if self.state and self.state == state:
@@ -209,6 +203,12 @@ class StateFilter(Filter):
     def form_function(self):
         return 'function(form) { return form.x.value }'
 
+    def url_without_me(self):
+        qs = self.filters.querystring_without_filter(self)
+        if qs != '?':
+            qs += '&'
+        return qs + '%s=%s' % (self.param, self.any_key)
+
 class SearchFilter(Filter):
     param = 'q'
     def __init__(self, filters):
-- 
2.39.2


From e472cd43637c3b30b45ace46146addb46b8a5980 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 12 Sep 2008 10:41:27 +1000
Subject: [PATCH 03/16] Don't apply delegate = Nobody filter by default

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/filters.py | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/apps/patchwork/filters.py b/apps/patchwork/filters.py
index 4b29bc9..228c9c2 100644
--- a/apps/patchwork/filters.py
+++ b/apps/patchwork/filters.py
@@ -309,21 +309,19 @@ class ArchiveFilter(Filter):
 
 class DelegateFilter(Filter):
     param = 'delegate'
+    no_delegate_key = '-'
+    no_delegate_str = 'Nobody'
     AnyDelegate = 1
 
     def __init__(self, filters):
         super(DelegateFilter, self).__init__(filters)
         self.name = 'Delegate'
         self.param = 'delegate'
-
-        # default to applied, but no delegate - this will result in patches with
-        # no delegate
         self.delegate = None
-        self.applied = True
 
     def _set_key(self, str):
-        if str == "*":
-            self.applied = False
+        if str == self.no_delegate_key:
+            self.applied = True
             self.delegate = None
             return
 
@@ -342,7 +340,7 @@ class DelegateFilter(Filter):
     def condition(self):
         if self.delegate:
             return self.delegate.get_profile().name()
-        return 'Nobody'
+        return self.no_delegate_str
 
     def _form(self):
         delegates = User.objects.filter(userprofile__maintainer_projects =
@@ -354,13 +352,14 @@ class DelegateFilter(Filter):
         if not self.applied:
             selected = 'selected'
 
-        str += '<option %s value="*">------</option>' % selected
+        str += '<option %s value="">------</option>' % selected
 
         selected = ''
-        if self.delegate is None:
+        if self.applied and self.delegate is None:
             selected = 'selected'
 
-        str += '<option %s value="">Nobody</option>' % selected
+        str += '<option %s value="%s">%s</option>' % \
+                (selected, self.no_delegate_key, self.no_delegate_str)
 
         for d in delegates:
             selected = ''
@@ -377,14 +376,8 @@ class DelegateFilter(Filter):
         if self.delegate:
             return self.delegate.id
         if self.applied:
-            return None
-        return '*'
-
-    def url_without_me(self):
-        qs = self.filters.querystring_without_filter(self)
-        if qs != '?':
-            qs += '&'
-        return qs + ('%s=*' % self.param)
+            return self.no_delegate_key
+        return None
 
     def set_status(self, *args, **kwargs):
         if 'delegate' in kwargs:
-- 
2.39.2


From 5799a55da8c20e0f3820b2e131c20083fe559675 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 12 Sep 2008 10:55:21 +1000
Subject: [PATCH 04/16] Remember state filter settings

We need to set a few 'selected' options..

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/filters.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/patchwork/filters.py b/apps/patchwork/filters.py
index 228c9c2..a722a24 100644
--- a/apps/patchwork/filters.py
+++ b/apps/patchwork/filters.py
@@ -188,8 +188,18 @@ class StateFilter(Filter):
 
     def _form(self):
         str = '<select name="%s">' % self.param
-        str += '<option value="%s">any</option>' % self.any_key
-        str += '<option value="">%s</option>' % self.action_req_str
+
+        selected = ''
+        if not self.applied:
+            selected = 'selected'
+        str += '<option %s value="%s">any</option>' % (selected, self.any_key)
+
+        selected = ''
+        if self.applied and self.state == None:
+            selected = 'selected'
+        str += '<option %s value="">%s</option>' % \
+               (selected, self.action_req_str)
+
         for state in State.objects.all():
             selected = ''
             if self.state and self.state == state:
-- 
2.39.2


From 46c0a2ab10f98c654168c5b1d61a43e31fa96d6d Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 12 Sep 2008 11:00:33 +1000
Subject: [PATCH 05/16] Fix mishandling of existing querystring parameters

Currently, we only get the first character of order= parameters
in the 'remove this filter' querystring.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/patchwork/filters.py b/apps/patchwork/filters.py
index a722a24..77fc768 100644
--- a/apps/patchwork/filters.py
+++ b/apps/patchwork/filters.py
@@ -438,7 +438,7 @@ class Filters:
 
         for (k, v) in self.dict.iteritems():
             if k not in params:
-                params[k] = v[0]
+                params[k] = v
 
         if remove is not None:
             if remove.param in params.keys():
-- 
2.39.2


From 7c9b2f902062ba84cfa327ccdba971920522cb50 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 12 Sep 2008 11:07:52 +1000
Subject: [PATCH 06/16] Fix 'activate' mispelling

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 templates/registration/registration_complete.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html
index eb91c15..a89c116 100644
--- a/templates/registration/registration_complete.html
+++ b/templates/registration/registration_complete.html
@@ -7,7 +7,7 @@
 
  <p>Registration successful!</p>
  <p>A confirmation email has been sent to your email address. You'll
- need to visit the link provided in that email to actiavate your
+ need to visit the link provided in that email to activate your
  patchwork account.</p>
 
 {% endblock %}
-- 
2.39.2


From 6034b55eee81c82058615f2a349d6c64cfb61e08 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 16 Sep 2008 16:43:32 +1000
Subject: [PATCH 07/16] Add 404 template

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 templates/404.html | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 templates/404.html

diff --git a/templates/404.html b/templates/404.html
new file mode 100644
index 0000000..fe2b0e4
--- /dev/null
+++ b/templates/404.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+
+{% block title %}404: File not found{% endblock %}
+{% block heading %}404: File not found{% endblock %}
+
+{% block body %}
+
+<p>The page URL requested (<code>{{ request_path }}</code>) does not exist.</p>
+
+{% endblock %}
-- 
2.39.2


From 96467db48884d72bc04fc23c8f957190fa004779 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 16 Sep 2008 17:34:55 +1000
Subject: [PATCH 08/16] Improve [PATCH] subject parsing

We'd like to leave some fragments of [PATCH]-style headers in the
patch subject, so add functionality to do this in clean_subject

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/bin/parsemail.py | 93 +++++++++++++++++++++++++++++++--
 1 file changed, 89 insertions(+), 4 deletions(-)

diff --git a/apps/patchwork/bin/parsemail.py b/apps/patchwork/bin/parsemail.py
index 15b62d2..2310ae8 100755
--- a/apps/patchwork/bin/parsemail.py
+++ b/apps/patchwork/bin/parsemail.py
@@ -199,15 +199,100 @@ def find_patch_for_comment(mail):
 
     return None
 
+split_re = re.compile('[,\s]+')
+
+def split_prefixes(prefix):
+    """ Turn a prefix string into a list of prefix tokens
+
+    >>> split_prefixes('PATCH')
+    ['PATCH']
+    >>> split_prefixes('PATCH,RFC')
+    ['PATCH', 'RFC']
+    >>> split_prefixes('')
+    []
+    >>> split_prefixes('PATCH,')
+    ['PATCH']
+    >>> split_prefixes('PATCH ')
+    ['PATCH']
+    >>> split_prefixes('PATCH,RFC')
+    ['PATCH', 'RFC']
+    >>> split_prefixes('PATCH 1/2')
+    ['PATCH', '1/2']
+    """
+    matches = split_re.split(prefix)
+    return [ s for s in matches if s != '' ]
+
 re_re = re.compile('^(re|fwd?)[:\s]\s*', re.I)
-prefix_re = re.compile('^\[.*\]\s*')
+prefix_re = re.compile('^\[([^\]]*)\]\s*(.*)$')
 whitespace_re = re.compile('\s+')
 
-def clean_subject(subject):
+def clean_subject(subject, drop_prefixes = None):
+    """ Clean a Subject: header from an incoming patch.
+
+    Removes Re: and Fwd: strings, as well as [PATCH]-style prefixes. By
+    default, only [PATCH] is removed, and we keep any other bracketed data
+    in the subject. If drop_prefixes is provided, remove those too,
+    comparing case-insensitively.
+
+    >>> clean_subject('meep')
+    'meep'
+    >>> clean_subject('Re: meep')
+    'meep'
+    >>> clean_subject('[PATCH] meep')
+    'meep'
+    >>> clean_subject('[PATCH RFC] meep')
+    '[RFC] meep'
+    >>> clean_subject('[PATCH,RFC] meep')
+    '[RFC] meep'
+    >>> clean_subject('[PATCH,1/2] meep')
+    '[1/2] meep'
+    >>> clean_subject('[PATCH RFC 1/2] meep')
+    '[RFC,1/2] meep'
+    >>> clean_subject('[PATCH] [RFC] meep')
+    '[RFC] meep'
+    >>> clean_subject('[PATCH] [RFC,1/2] meep')
+    '[RFC,1/2] meep'
+    >>> clean_subject('[PATCH] [RFC] [1/2] meep')
+    '[RFC,1/2] meep'
+    >>> clean_subject('[PATCH] rewrite [a-z] regexes')
+    'rewrite [a-z] regexes'
+    >>> clean_subject('[PATCH] [RFC] rewrite [a-z] regexes')
+    '[RFC] rewrite [a-z] regexes'
+    >>> clean_subject('[foo] [bar] meep', ['foo'])
+    '[bar] meep'
+    >>> clean_subject('[FOO] [bar] meep', ['foo'])
+    '[bar] meep'
+    """
+
+    if drop_prefixes is None:
+        drop_prefixes = []
+    else:
+        drop_prefixes = [ s.lower() for s in drop_prefixes ]
+
+    drop_prefixes.append('patch')
+
+    # remove Re:, Fwd:, etc
     subject = re_re.sub(' ', subject)
-    subject = prefix_re.sub('', subject)
+
+    prefixes = []
+
+    match = prefix_re.match(subject)
+
+    while match:
+        prefix_str = match.group(1)
+        prefixes += [ p for p in split_prefixes(prefix_str) \
+                        if p.lower() not in drop_prefixes]
+
+        subject = match.group(2)
+        match = prefix_re.match(subject)
+
     subject = whitespace_re.sub(' ', subject)
-    return subject.strip()
+
+    subject = subject.strip()
+    if prefixes:
+        subject = '[%s] %s' % (','.join(prefixes), subject)
+
+    return subject
 
 sig_re = re.compile('^(-{2,3} ?|_+)\n.*', re.S | re.M)
 def clean_content(str):
-- 
2.39.2


From f21a92596f97dd093f693a4cc89577aacbe164cb Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 16 Sep 2008 17:39:50 +1000
Subject: [PATCH 09/16] Drop project.linkname from patch subject lines

.. otherwise every cell patch will be prefixed with [Cbe-oss-dev]

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/bin/parsemail.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/patchwork/bin/parsemail.py b/apps/patchwork/bin/parsemail.py
index 2310ae8..b679894 100755
--- a/apps/patchwork/bin/parsemail.py
+++ b/apps/patchwork/bin/parsemail.py
@@ -149,9 +149,9 @@ def find_content(project, mail):
 
     if patchbuf:
         mail_headers(mail)
-        patch = Patch(name = clean_subject(mail.get('Subject')),
-                content = patchbuf, date = mail_date(mail),
-                headers = mail_headers(mail))
+	name = clean_subject(mail.get('Subject'), [project.linkname])
+        patch = Patch(name = name, content = patchbuf,
+                    date = mail_date(mail), headers = mail_headers(mail))
 
     if commentbuf:
         if patch:
-- 
2.39.2


From ae13beca83bcd061d7b0158ed4bdd45abf2eb855 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 16 Sep 2008 20:06:54 +1000
Subject: [PATCH 10/16] Fix handling of newlines in subjects

By doing two passes of whitespace normalisation

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/bin/parsemail.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/patchwork/bin/parsemail.py b/apps/patchwork/bin/parsemail.py
index b679894..3fbe473 100755
--- a/apps/patchwork/bin/parsemail.py
+++ b/apps/patchwork/bin/parsemail.py
@@ -240,6 +240,8 @@ def clean_subject(subject, drop_prefixes = None):
     'meep'
     >>> clean_subject('[PATCH] meep')
     'meep'
+    >>> clean_subject('[PATCH] meep \\n meep')
+    'meep meep'
     >>> clean_subject('[PATCH RFC] meep')
     '[RFC] meep'
     >>> clean_subject('[PATCH,RFC] meep')
@@ -274,6 +276,9 @@ def clean_subject(subject, drop_prefixes = None):
     # remove Re:, Fwd:, etc
     subject = re_re.sub(' ', subject)
 
+    # normalise whitespace
+    subject = whitespace_re.sub(' ', subject)
+
     prefixes = []
 
     match = prefix_re.match(subject)
-- 
2.39.2


From 9b7216bc0bd74b30796cdb64ce8b39a6110c9157 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 19 Sep 2008 18:01:11 +1000
Subject: [PATCH 11/16] Remove superfluous print from parsemail.py

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/bin/parsemail.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/patchwork/bin/parsemail.py b/apps/patchwork/bin/parsemail.py
index 3fbe473..1f21393 100755
--- a/apps/patchwork/bin/parsemail.py
+++ b/apps/patchwork/bin/parsemail.py
@@ -103,7 +103,6 @@ def find_author(mail):
 def mail_date(mail):
     t = parsedate_tz(mail.get('Date', ''))
     if not t:
-        print "using now()"
         return datetime.datetime.utcnow()
     return datetime.datetime.utcfromtimestamp(mktime_tz(t))
 
-- 
2.39.2


From b537242352ca645916c807ea71a3094758d6b9d8 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 19 Sep 2008 18:10:52 +1000
Subject: [PATCH 12/16] [test] Add patchwork testing infrastructure

Add a small set of initial tests for the patch parsing code.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/tests/__init__.py              | 33 +++++++
 .../tests/patches/0001-add-line.patch         |  7 ++
 apps/patchwork/tests/patchparser.py           | 91 +++++++++++++++++++
 3 files changed, 131 insertions(+)
 create mode 100644 apps/patchwork/tests/__init__.py
 create mode 100644 apps/patchwork/tests/patches/0001-add-line.patch
 create mode 100644 apps/patchwork/tests/patchparser.py

diff --git a/apps/patchwork/tests/__init__.py b/apps/patchwork/tests/__init__.py
new file mode 100644
index 0000000..42413a1
--- /dev/null
+++ b/apps/patchwork/tests/__init__.py
@@ -0,0 +1,33 @@
+# Patchwork - automated patch tracking system
+# Copyright (C) 2008 Jeremy Kerr <jk@ozlabs.org>
+#
+# This file is part of the Patchwork package.
+#
+# Patchwork is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Patchwork is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchwork; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+import unittest
+from patchwork.tests import patchparser
+
+modules = [patchparser]
+
+def suite():
+    suite = unittest.TestSuite()
+    loader = unittest.TestLoader()
+
+    for module in modules:
+        tests = loader.loadTestsFromModule(module)
+        suite.addTests(tests)
+
+    return suite
diff --git a/apps/patchwork/tests/patches/0001-add-line.patch b/apps/patchwork/tests/patches/0001-add-line.patch
new file mode 100644
index 0000000..c6cb9f1
--- /dev/null
+++ b/apps/patchwork/tests/patches/0001-add-line.patch
@@ -0,0 +1,7 @@
+diff --git a/meep.text b/meep.text
+index 3d75d48..a57f4dd 100644
+--- a/meep.text
++++ b/meep.text
+@@ -1,1 +1,2 @@
+ meep
++meep
diff --git a/apps/patchwork/tests/patchparser.py b/apps/patchwork/tests/patchparser.py
new file mode 100644
index 0000000..19b7aea
--- /dev/null
+++ b/apps/patchwork/tests/patchparser.py
@@ -0,0 +1,91 @@
+# Patchwork - automated patch tracking system
+# Copyright (C) 2008 Jeremy Kerr <jk@ozlabs.org>
+#
+# This file is part of the Patchwork package.
+#
+# Patchwork is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Patchwork is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchwork; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+import unittest
+import os
+from email.mime.text import MIMEText
+from email.mime.multipart import MIMEMultipart
+from patchwork.models import Project
+
+test_mail_dir  = 'patchwork/tests/mail'
+test_patch_dir = 'patchwork/tests/patches'
+
+class PatchTest(unittest.TestCase):
+    default_sender = 'Test Author <test@exmaple.com>'
+    default_subject = 'Test Subject'
+    project = Project(linkname = 'test-project')
+
+    def create_email(self, content, subject = None, sender = None,
+            multipart = False):
+        if subject is None:
+            subject = self.default_subject
+        if sender is None:
+            sender = self.default_sender
+
+        if multipart:
+            msg = MIMEMultipart()
+            body = MIMEText(content, _subtype = 'plain')
+            msg.attach(body)
+        else:
+            msg = MIMEText(content)
+
+        msg['Subject'] = subject
+        msg['From'] = sender
+        msg['List-Id'] = self.project.linkname
+
+        return msg
+
+    def read_patch(self, filename):
+        return file(os.path.join(test_patch_dir, filename)).read()
+
+
+from patchwork.bin.parsemail import find_content
+
+class InlinePatchTest(PatchTest):
+    patch_filename = '0001-add-line.patch'
+    test_comment = 'Test for attached patch'
+
+    def setUp(self):
+        self.orig_patch = self.read_patch(self.patch_filename)
+        email = self.create_email(self.test_comment + '\n' + self.orig_patch)
+        (self.patch, self.comment) = find_content(self.project, email)
+
+    def testPatchPresence(self):
+        self.assertTrue(self.patch is not None)
+
+    def testPatchContent(self):
+        self.assertEquals(self.patch.content, self.orig_patch)
+
+    def testCommentPresence(self):
+        self.assertTrue(self.comment is not None)
+
+    def testCommentContent(self):
+        self.assertEquals(self.comment.content, self.test_comment)
+
+
+class AttachmentPatchTest(InlinePatchTest):
+    patch_filename = '0001-add-line.patch'
+    test_comment = 'Test for attached patch'
+
+    def setUp(self):
+        self.orig_patch = self.read_patch(self.patch_filename)
+        email = self.create_email(self.test_comment, multipart = True)
+        attachment = MIMEText(self.orig_patch, _subtype = 'x-patch')
+        email.attach(attachment)
+        (self.patch, self.comment) = find_content(self.project, email)
-- 
2.39.2


From 26c532d2cfeec0bd4339b5c1db4bb2b3d4a3d3f0 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Sat, 20 Sep 2008 10:11:38 +1000
Subject: [PATCH 13/16] [test] Add test for signatures in comments

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/tests/patchparser.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apps/patchwork/tests/patchparser.py b/apps/patchwork/tests/patchparser.py
index 19b7aea..3b10ef5 100644
--- a/apps/patchwork/tests/patchparser.py
+++ b/apps/patchwork/tests/patchparser.py
@@ -89,3 +89,16 @@ class AttachmentPatchTest(InlinePatchTest):
         attachment = MIMEText(self.orig_patch, _subtype = 'x-patch')
         email.attach(attachment)
         (self.patch, self.comment) = find_content(self.project, email)
+
+
+class SignatureCommentTest(InlinePatchTest):
+    patch_filename = '0001-add-line.patch'
+    test_comment = 'Test comment\nmore comment'
+
+    def setUp(self):
+        self.orig_patch = self.read_patch(self.patch_filename)
+        email = self.create_email( \
+                self.test_comment + '\n' + \
+                '-- \nsig\n' + self.orig_patch)
+        (self.patch, self.comment) = find_content(self.project, email)
+
-- 
2.39.2


From 5787cddc0bde4514cba96a360f89841e13d2e506 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Sat, 20 Sep 2008 10:30:05 +1000
Subject: [PATCH 14/16] [parser] Don't remove --- update lines

We'd like to keep update lines in the patch comments, so change the
signature-removal code to allow them to pass through.

Also, add appropriate tests.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/bin/parsemail.py     |  3 ++-
 apps/patchwork/tests/patchparser.py | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/apps/patchwork/bin/parsemail.py b/apps/patchwork/bin/parsemail.py
index 1f21393..b0f1497 100755
--- a/apps/patchwork/bin/parsemail.py
+++ b/apps/patchwork/bin/parsemail.py
@@ -298,8 +298,9 @@ def clean_subject(subject, drop_prefixes = None):
 
     return subject
 
-sig_re = re.compile('^(-{2,3} ?|_+)\n.*', re.S | re.M)
+sig_re = re.compile('^(-- |_+)\n.*', re.S | re.M)
 def clean_content(str):
+    """ Try to remove signature (-- ) and list footer (_____) cruft """
     str = sig_re.sub('', str)
     return str.strip()
 
diff --git a/apps/patchwork/tests/patchparser.py b/apps/patchwork/tests/patchparser.py
index 3b10ef5..2e207bf 100644
--- a/apps/patchwork/tests/patchparser.py
+++ b/apps/patchwork/tests/patchparser.py
@@ -102,3 +102,27 @@ class SignatureCommentTest(InlinePatchTest):
                 '-- \nsig\n' + self.orig_patch)
         (self.patch, self.comment) = find_content(self.project, email)
 
+
+class ListFooterTest(InlinePatchTest):
+    patch_filename = '0001-add-line.patch'
+    test_comment = 'Test comment\nmore comment'
+
+    def setUp(self):
+        self.orig_patch = self.read_patch(self.patch_filename)
+        email = self.create_email( \
+                self.test_comment + '\n' + \
+                '_______________________________________________\n' + \
+                'Linuxppc-dev mailing list\n' + \
+                self.orig_patch)
+        (self.patch, self.comment) = find_content(self.project, email)
+
+
+class UpdateCommentTest(InlinePatchTest):
+    """ Test for '---\nUpdate: v2' style comments to patches. """
+    patch_filename = '0001-add-line.patch'
+    test_comment = 'Test comment\nmore comment\n---\nUpdate: test update'
+
+class UpdateSigCommentTest(SignatureCommentTest):
+    """ Test for '---\nUpdate: v2' style comments to patches, with a sig """
+    patch_filename = '0001-add-line.patch'
+    test_comment = 'Test comment\nmore comment\n---\nUpdate: test update'
-- 
2.39.2


From 918fab011f24f22f9915674c104258e20a5fcf26 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Sat, 20 Sep 2008 12:09:10 +1000
Subject: [PATCH 15/16] [parser] Decode From: headers

We're getting a few utf-8 encoded From: addresses, so decode before
saving to the DB.

Also, add tests.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/bin/parsemail.py     | 17 +++++++++--
 apps/patchwork/tests/patchparser.py | 47 +++++++++++++++++++++++++++--
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/apps/patchwork/bin/parsemail.py b/apps/patchwork/bin/parsemail.py
index b0f1497..07554bc 100755
--- a/apps/patchwork/bin/parsemail.py
+++ b/apps/patchwork/bin/parsemail.py
@@ -26,11 +26,11 @@ import time
 import operator
 from email import message_from_file
 try:
-    from email.header import Header
+    from email.header import Header, decode_header
     from email.utils import parsedate_tz, mktime_tz
 except ImportError:
     # Python 2.4 compatibility
-    from email.Header import Header
+    from email.Header import Header, decode_header
     from email.Utils import parsedate_tz, mktime_tz
 
 from patchwork.parser import parse_patch
@@ -38,6 +38,17 @@ from patchwork.models import Patch, Project, Person, Comment
 
 list_id_headers = ['List-ID', 'X-Mailing-List']
 
+def clean_header(header):
+    """ Decode (possibly non-ascii) headers """
+
+    def decode(str, fragment):
+        (frag_str, frag_encoding) = fragment
+        if frag_encoding:
+            return str + frag_str.decode(frag_encoding)
+        return str + frag_str.decode()
+
+    return reduce(decode, decode_header(header), u'').strip()
+
 def find_project(mail):
     project = None
     listid_re = re.compile('.*<([^>]+)>.*', re.S)
@@ -60,7 +71,7 @@ def find_project(mail):
 
 def find_author(mail):
 
-    from_header = mail.get('From').strip()
+    from_header = clean_header(mail.get('From'))
     (name, email) = (None, None)
 
     # tuple of (regex, fn)
diff --git a/apps/patchwork/tests/patchparser.py b/apps/patchwork/tests/patchparser.py
index 2e207bf..6fe7968 100644
--- a/apps/patchwork/tests/patchparser.py
+++ b/apps/patchwork/tests/patchparser.py
@@ -21,7 +21,8 @@ import unittest
 import os
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
-from patchwork.models import Project
+from email import message_from_string
+from patchwork.models import Project, Person
 
 test_mail_dir  = 'patchwork/tests/mail'
 test_patch_dir = 'patchwork/tests/patches'
@@ -55,7 +56,7 @@ class PatchTest(unittest.TestCase):
         return file(os.path.join(test_patch_dir, filename)).read()
 
 
-from patchwork.bin.parsemail import find_content
+from patchwork.bin.parsemail import find_content, find_author
 
 class InlinePatchTest(PatchTest):
     patch_filename = '0001-add-line.patch'
@@ -126,3 +127,45 @@ class UpdateSigCommentTest(SignatureCommentTest):
     """ Test for '---\nUpdate: v2' style comments to patches, with a sig """
     patch_filename = '0001-add-line.patch'
     test_comment = 'Test comment\nmore comment\n---\nUpdate: test update'
+
+class SenderEncodingTest(unittest.TestCase):
+    sender_name = u'example user'
+    sender_email = 'user@example.com'
+    from_header = 'example user <user@example.com>'
+
+    def setUp(self):
+        mail = 'From: %s\n' % self.from_header + \
+               'Subject: test\n\n' + \
+               'test'
+        self.email = message_from_string(mail)
+        (self.person, new) = find_author(self.email)
+        self.person.save()
+
+    def tearDown(self):
+        self.person.delete()
+
+    def testName(self):
+        self.assertEquals(self.person.name, self.sender_name)
+
+    def testEmail(self):
+        self.assertEquals(self.person.email, self.sender_email)
+
+    def testDBQueryName(self):
+        db_person = Person.objects.get(name = self.sender_name)
+        self.assertEquals(self.person, db_person)
+
+    def testDBQueryEmail(self):
+        db_person = Person.objects.get(email = self.sender_email)
+        self.assertEquals(self.person, db_person)
+
+
+class SenderUTF8QPEncodingTest(SenderEncodingTest):
+    sender_name = u'\xe9xample user'
+    from_header = '=?utf-8?q?=C3=A9xample=20user?= <user@example.com>'
+
+class SenderUTF8QPSplitEncodingTest(SenderEncodingTest):
+    sender_name = u'\xe9xample user'
+    from_header = '=?utf-8?q?=C3=A9xample=20?= user <user@example.com>'
+
+class SenderUTF8B64EncodingTest(SenderUTF8QPEncodingTest):
+    from_header = '=?utf-8?B?w6l4YW1wbGUgdXNlcg==?= <user@example.com>'
-- 
2.39.2


From 9e12fad86bebbd70025b948cc0ea9fbff44a725a Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Sat, 20 Sep 2008 12:13:58 +1000
Subject: [PATCH 16/16] Add bin/__init__.py

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 apps/patchwork/bin/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/patchwork/bin/__init__.py

diff --git a/apps/patchwork/bin/__init__.py b/apps/patchwork/bin/__init__.py
new file mode 100644
index 0000000..e69de29
-- 
2.39.2