]> git.ozlabs.org Git - patchwork/blobdiff - apps/patchwork/models.py
Add nacked-by tag
[patchwork] / apps / patchwork / models.py
index cfc875ff7ce2c01654f58fa65d183dc49509b716..fa213dc03e8dfa9a068e11f780d581a358acdb4d 100644 (file)
@@ -258,7 +258,7 @@ class Patch(models.Model):
         if postscript:
             body += '---\n' + postscript.strip() + '\n'
 
-        body += self.content
+        body += '\n' + self.content
 
         mail = PatchMbox(body)
         mail['Subject'] = self.name
@@ -288,7 +288,7 @@ 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)-by: .*$', re.M | re.I)
 
     def patch_responses(self):
         return ''.join([ match.group(0) + '\n' for match in \
@@ -345,7 +345,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)