X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Fmodels.py;h=fa213dc03e8dfa9a068e11f780d581a358acdb4d;hb=487b53576fb71be3d675605efa41e118e4993f32;hp=d0c2a6ed5d4c467fe289aa2ea1eddc64096c6786;hpb=c105cb0f107a7459abc8c33988d2da24582a7a5a;p=patchwork

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index d0c2a6e..fa213dc 100644
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -227,6 +227,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 +239,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 +255,10 @@ class Patch(models.Model):
         if body:
             body += '\n'
 
-        body += self.content
+        if postscript:
+            body += '---\n' + postscript.strip() + '\n'
+
+        body += '\n' + self.content
 
         mail = PatchMbox(body)
         mail['Subject'] = self.name
@@ -275,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 \
@@ -295,12 +308,25 @@ class Bundle(models.Model):
     def n_patches(self):
         return self.patches.all().count()
 
+    def ordered_patches(self):
+        return self.patches.order_by('bundlepatch__order');
+
     def append_patch(self, patch):
         # todo: use the aggregate queries in django 1.1
-        orders = BundlePatch.objects.filter(bundle = self).values('order')
-        max_order = max([ v for (k, v) in orders])
+        orders = BundlePatch.objects.filter(bundle = self).order_by('-order') \
+                 .values('order')
+
+        if len(orders) > 0:
+            max_order = orders[0]['order']
+        else:
+            max_order = 0
+
+        # see if the patch is already in this bundle
+        if BundlePatch.objects.filter(bundle = self, patch = patch).count():
+            raise Exception("patch is already in bundle")
 
-        bp = BundlePatch.objects.create(bundle = self, patch = patch, order = max_order + 1)
+        bp = BundlePatch.objects.create(bundle = self, patch = patch,
+                order = max_order + 1)
         bp.save()
 
     class Meta:
@@ -319,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)
@@ -327,7 +353,8 @@ class BundlePatch(models.Model):
     order = models.IntegerField()
 
     class Meta:
-        unique_together = [('bundle', 'patch'), ('bundle', 'order')]
+        unique_together = [('bundle', 'patch')]
+        ordering = ['order']
 
 class UserPersonConfirmation(models.Model):
     user = models.ForeignKey(User)