X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Fmodels.py;h=edb52df70d254b2026e8c7e8aa1bc37405747f26;hb=ddb04aaac7d9875f1dfd7970944dab6aa6557099;hp=a672f9ad41ebe5f16879db45a655a42b2c5643c8;hpb=6ce62d26739ebf0dd81ecff5284adf3fbe2aed23;p=patchwork

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index a672f9a..edb52df 100644
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -32,6 +32,7 @@ import random
 try:
     from email.mime.nonmultipart import MIMENonMultipart
     from email.encoders import encode_7or8bit
+    from email.parser import HeaderParser
     import email.utils
 except ImportError:
     # Python 2.4 compatibility
@@ -186,7 +187,8 @@ class Patch(models.Model):
     state = models.ForeignKey(State)
     archived = models.BooleanField(default = False)
     headers = models.TextField(blank = True)
-    content = models.TextField()
+    content = models.TextField(null = True)
+    pull_url = models.CharField(max_length=255, null = True)
     commit_ref = models.CharField(max_length=255, null = True, blank = True)
     hash = HashField(null = True, db_index = True)
 
@@ -202,7 +204,7 @@ class Patch(models.Model):
         except:
             self.state = State.objects.get(ordering =  0)
 
-        if self.hash is None:
+        if self.hash is None and self.content is not None:
             self.hash = hash_patch(self.content).hexdigest()
 
         super(Patch, self).save()
@@ -227,6 +229,8 @@ class Patch(models.Model):
         return str.strip('-') + '.patch'
 
     def mbox(self):
+        postscript_re = re.compile('\n-{2,3} ?\n')
+
         comment = None
         try:
             comment = Comment.objects.get(patch = self, msgid = self.msgid)
@@ -237,6 +241,14 @@ class Patch(models.Model):
         if comment:
             body = comment.content.strip() + "\n"
 
+        parts = postscript_re.split(body, 1)
+        if len(parts) == 2:
+            (body, postscript) = parts
+            body = body.strip() + "\n"
+            postscript = postscript.strip() + "\n"
+        else:
+            postscript = ''
+
         responses = False
         for comment in Comment.objects.filter(patch = self) \
                 .exclude(msgid = self.msgid):
@@ -245,7 +257,11 @@ class Patch(models.Model):
         if body:
             body += '\n'
 
-        body += self.content
+        if postscript:
+            body += '---\n' + postscript.strip() + '\n'
+
+        if self.content:
+            body += '\n' + self.content
 
         mail = PatchMbox(body)
         mail['Subject'] = self.name
@@ -253,10 +269,17 @@ class Patch(models.Model):
                         time.mktime(self.date.utctimetuple()))
         mail['From'] = unicode(self.submitter)
         mail['X-Patchwork-Id'] = str(self.id)
+        mail['Message-Id'] = self.msgid
         mail.set_unixfrom('From patchwork ' + self.date.ctime())
 
-        return mail
 
+        copied_headers = ['To', 'Cc']
+        orig_headers = HeaderParser().parsestr(str(self.headers))
+        for header in copied_headers:
+            if header in orig_headers:
+                mail[header] = orig_headers[header]
+
+        return mail
 
     @models.permalink
     def get_absolute_url(self):
@@ -275,7 +298,9 @@ class Comment(models.Model):
     headers = models.TextField(blank = True)
     content = models.TextField()
 
-    response_re = re.compile('^(Acked|Signed-off|Nacked)-by: .*$', re.M)
+    response_re = re.compile( \
+            '^(Tested|Reviewed|Acked|Signed-off|Nacked|Reported)-by: .*$',
+            re.M | re.I)
 
     def patch_responses(self):
         return ''.join([ match.group(0) + '\n' for match in \
@@ -332,7 +357,7 @@ class Bundle(models.Model):
 
     def mbox(self):
         return '\n'.join([p.mbox().as_string(True) \
-                        for p in self.patches.all()])
+                        for p in self.ordered_patches()])
 
 class BundlePatch(models.Model):
     patch = models.ForeignKey(Patch)