from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from django.contrib.sites.models import Site
-from django.conf import settings
from patchwork.parser import hash_patch
import re
import datetime, time
-import string
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
from email.MIMENonMultipart import MIMENonMultipart
from email.Encoders import encode_7or8bit
+ from email.Parser import HeaderParser
import email.Utils
email.utils = email.Utils
class Person(models.Model):
email = models.CharField(max_length=255, unique = True)
- name = models.CharField(max_length=255, null = True)
- user = models.ForeignKey(User, null = True)
+ name = models.CharField(max_length=255, null = True, blank = True)
+ user = models.ForeignKey(User, null = True, blank = True)
- def __str__(self):
+ def __unicode__(self):
if self.name:
- return '%s <%s>' % (self.name, self.email)
+ return u'%s <%s>' % (self.name, self.email)
else:
return self.email
listid = models.CharField(max_length=255, unique=True)
listemail = models.CharField(max_length=200)
- def __str__(self):
+ def __unicode__(self):
return self.name
class UserProfile(models.Model):
user = models.ForeignKey(User, unique = True)
- primary_project = models.ForeignKey(Project, null = True)
+ primary_project = models.ForeignKey(Project, null = True, blank = True)
maintainer_projects = models.ManyToManyField(Project,
related_name = 'maintainer_project')
send_email = models.BooleanField(default = False,
def name(self):
if self.user.first_name or self.user.last_name:
names = filter(bool, [self.user.first_name, self.user.last_name])
- return ' '.join(names)
+ return u' '.join(names)
return self.user.username
def contributor_projects(self):
person.link_to_user(self.user)
person.save()
- def __str__(self):
+ def __unicode__(self):
return self.name()
+def _user_created_callback(sender, created, instance, **kwargs):
+ if not created:
+ return
+ profile = UserProfile(user = instance)
+ profile.save()
+
+models.signals.post_save.connect(_user_created_callback, sender = User)
+
class State(models.Model):
name = models.CharField(max_length = 100)
ordering = models.IntegerField(unique = True)
action_required = models.BooleanField(default = True)
- def __str__(self):
+ def __unicode__(self):
return self.name
class Meta:
state = models.ForeignKey(State)
archived = models.BooleanField(default = False)
headers = models.TextField(blank = True)
- content = models.TextField()
+ content = models.TextField(null = True, blank = True)
+ pull_url = models.CharField(max_length=255, null = True, blank = True)
commit_ref = models.CharField(max_length=255, null = True, blank = True)
- hash = HashField(null = True, db_index = True)
+ hash = HashField(null = True, blank = True)
- def __str__(self):
+ def __unicode__(self):
return self.name
def comments(self):
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()
if self.submitter.user == user or self.delegate == user:
return True
- profile = user.get_profile()
return self.project in user.get_profile().maintainer_projects.all()
- def form(self):
- f = PatchForm(instance = self, prefix = self.id)
- return f
-
def filename(self):
fname_re = re.compile('[^-_A-Za-z0-9\.]+')
str = fname_re.sub('-', self.name)
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"
- responses = False
+ parts = postscript_re.split(body, 1)
+ if len(parts) == 2:
+ (body, postscript) = parts
+ body = body.strip() + "\n"
+ postscript = postscript.strip() + "\n"
+ else:
+ postscript = ''
+
for comment in Comment.objects.filter(patch = self) \
.exclude(msgid = self.msgid):
body += comment.patch_responses()
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 \
owner = models.ForeignKey(User)
project = models.ForeignKey(Project)
name = models.CharField(max_length = 50, null = False, blank = False)
- patches = models.ManyToManyField(Patch)
+ patches = models.ManyToManyField(Patch, through = 'BundlePatch')
public = models.BooleanField(default = False)
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).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.save()
+
class Meta:
unique_together = [('owner', 'name')]
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)
+ bundle = models.ForeignKey(Bundle)
+ order = models.IntegerField()
+
+ class Meta:
+ unique_together = [('bundle', 'patch')]
+ ordering = ['order']
class UserPersonConfirmation(models.Model):
user = models.ForeignKey(User)
projects / patchwork / blobdiff