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
from email.MIMENonMultipart import MIMENonMultipart
from email.Encoders import encode_7or8bit
+ from email.Parser import HeaderParser
import email.Utils
email.utils = email.Utils
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)
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()
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)
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):
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
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):
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 \
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)