Late in the development of the series feature, it was decided that there
were advantages to allowing an N:M relationship between series and
patches would be desirable. This would allow us to do things like create
complete series where a sole vN patch was sent to a list rather than the
full series. After some time using series in the wild, it's apparent
that such features are very difficult to implement correctly and will
likely never be implemented. As such, it's time to start cleaning up the
mess, paving the way for things like an improved tagging feature.
There are some significant changes to the model required:
- models.py, migrations/0027, migrations/0028, migrations/0029
The migrations make the following changes:
1. - Add 'Patch.series_alt' and 'Patch.number' fields.
2. - Populate the 'Patch.series_alt' and 'Patch.number' fields from
their 'SeriesPatch' equivalents.
3. - Remove the 'SeriesPatch' model.
- Rename 'Patch.series_alt' to 'Patch.series'.
- Change 'Series.cover_letter' to a 'OneToOneField' since a cover
letter can no longer be assigned to multiple series.
Note that the migrations have to be split into multiple parts as the
combined migration raises an OperationalError as below.
(1072, "Key column 'series_alt_id' doesn't exist in table")
This is due to Django's penchant for creating indexes for newly
created fields, as noted here: https://stackoverflow.com/q/35158530/
Aside from the model changes, there are numerous other changes required:
- admin.py
Reflect model changes for the 'PatchInline' inline used by
'SeriesAdmin'
- api/cover.py, api/patch.py
Update the 'series' field for the cover letter and patch resources to
reflect the model changes. A 'to_representation' function is added in
both cases to post-process this field and make it look like a list
again. This is necessary to avoid breaking clients.
- parser.py
Update to reflect the replacement of 'SeriesPatch' with 'Patch'.
- signals.py
Update to filter on changes to 'Patch' instead of 'SeriesPatch'. This
requires some reworking due to how we set these fields now, as we can
no longer receive on 'post_save' signals for 'SeriesPatch' and must
instead watch for 'pre_save' on 'Patch', which is what we do for
delegate and state changes on same.
- templates/patchwork/*.html
Remove logic that handled multiple series in favour of the (simpler)
single series logic.
- tests/*
Modify the 'create_series_patch' helper to reflect the removal of the
'SeriesPatch' model. This entire helper will be removed in a future
change. Improve some tests to cover edge cases that were highlighted
during development
Unfortunately, all of the above changes must go in at the same time,
otherwise we end up with either (a) broken views, API etc. or (b) split
brain because we need to keep the new single-series fields alongside the
older multi-series fields and models while we rework the views. It's
unfortunate but there's not much to be done here.
Signed-off-by: Stephen Finucane <step...@that.guru>
Cc: Daniel Axtens <d...@axtens.net>
Cc: Stewart Smith <stew...@linux.ibm.com>
Cc: Veronika Kabatova <vkaba...@redhat.com>
Cc: Don Zickus <dzic...@redhat.com>
---
Daniel, Stewart: This is a big change but I think it's (a) worthwhile
and (b) is more mechanical than anything. I would appreciate your eyes
on the migrations though, assuming you have time, to make sure we're not
shooting ourselves in the foot here.
Veronika, Don: This is the thing I've been holding off on the improved
tagging support for. This should allow us to simplify that patch and
reason about it a little more. I'd like to get this in first but tagging
would be my next priority and I would be more than happy to help with
the rebasing of that patch, if necessary.
---
patchwork/admin.py | 2 +-
patchwork/api/cover.py | 19 ++++--
patchwork/api/patch.py | 20 +++++--
.../0031_add_patch_series_fields.py | 32 ++++++++++
...migrate_data_from_series_patch_to_patch.py | 35 +++++++++++
.../0033_remove_patch_series_model.py | 58 ++++++++++++++++++
patchwork/models.py | 60 +++++++------------
patchwork/parser.py | 6 +-
patchwork/signals.py | 40 ++++++-------
.../templates/patchwork/download_buttons.html | 17 +-----
patchwork/templates/patchwork/patch-list.html | 12 ++--
patchwork/templates/patchwork/submission.html | 26 ++------
patchwork/tests/test_detail.py | 16 -----
patchwork/tests/test_events.py | 11 +++-
patchwork/tests/test_series.py | 32 ++++++----
patchwork/tests/utils.py | 24 +++++---
patchwork/views/cover.py | 1 -
patchwork/views/patch.py | 3 +-
patchwork/views/utils.py | 17 ++----
19 files changed, 263 insertions(+), 168 deletions(-)
create mode 100644 patchwork/migrations/0031_add_patch_series_fields.py
create mode 100644
patchwork/migrations/0032_migrate_data_from_series_patch_to_patch.py
create mode 100644 patchwork/migrations/0033_remove_patch_series_model.py
diff --git a/patchwork/admin.py b/patchwork/admin.py
index d43cc4dd..cb1feb24 100644
--- a/patchwork/admin.py
+++ b/patchwork/admin.py
@@ -129,7 +129,7 @@ admin.site.register(Comment, CommentAdmin)
class PatchInline(admin.StackedInline):
- model = Series.patches.through
+ model = Patch
extra = 0
diff --git a/patchwork/api/cover.py b/patchwork/api/cover.py
index b497fd85..3a9fc003 100644
--- a/patchwork/api/cover.py
+++ b/patchwork/api/cover.py
@@ -38,7 +38,7 @@ class
CoverLetterListSerializer(BaseHyperlinkedModelSerializer):
project = ProjectSerializer(read_only=True)
submitter = PersonSerializer(read_only=True)
mbox = SerializerMethodField()
- series = SeriesSerializer(many=True, read_only=True)
+ series = SeriesSerializer(read_only=True)
comments = SerializerMethodField()
def get_web_url(self, instance):
@@ -53,6 +53,15 @@ class
CoverLetterListSerializer(BaseHyperlinkedModelSerializer):
return self.context.get('request').build_absolute_uri(
reverse('api-cover-comment-list', kwargs={'pk': cover.id}))
+ def to_representation(self, instance):
+ # NOTE(stephenfin): This is here to ensure our API looks the same even
+ # after we changed the series-patch relationship from M:N to 1:N. It
+ # will be removed in API v2
+ data = super(CoverLetterListSerializer, self).to_representation(
+ instance)
+ data['series'] = [data['series']]
+ return data
+
class Meta:
model = CoverLetter
fields = ('id', 'url', 'web_url', 'project', 'msgid', 'date', 'name',
@@ -103,8 +112,8 @@ class CoverLetterList(ListAPIView):
ordering = 'id'
def get_queryset(self):
- return CoverLetter.objects.all().prefetch_related('series')\
- .select_related('project', 'submitter')\
+ return CoverLetter.objects.all()\
+ .select_related('project', 'submitter', 'series')\
.defer('content', 'headers')
@@ -114,5 +123,5 @@ class CoverLetterDetail(RetrieveAPIView):
serializer_class = CoverLetterDetailSerializer
def get_queryset(self):
- return CoverLetter.objects.all().prefetch_related('series')\
- .select_related('project', 'submitter')
+ return CoverLetter.objects.all()\
+ .select_related('project', 'submitter', 'series')
diff --git a/patchwork/api/patch.py b/patchwork/api/patch.py
index 9d890eb1..549ec4fa 100644
--- a/patchwork/api/patch.py
+++ b/patchwork/api/patch.py
@@ -83,7 +83,7 @@ class PatchListSerializer(BaseHyperlinkedModelSerializer):
submitter = PersonSerializer(read_only=True)
delegate = UserSerializer()
mbox = SerializerMethodField()
- series = SeriesSerializer(many=True, read_only=True)
+ series = SeriesSerializer(read_only=True)
comments = SerializerMethodField()
check = SerializerMethodField()
checks = SerializerMethodField()
@@ -113,6 +113,14 @@ class PatchListSerializer(BaseHyperlinkedModelSerializer):
# model
return {}
+ def to_representation(self, instance):
+ # NOTE(stephenfin): This is here to ensure our API looks the same even
+ # after we changed the series-patch relationship from M:N to 1:N. It
+ # will be removed in API v2
+ data = super(PatchListSerializer, self).to_representation(instance)
+ data['series'] = [data['series']]
+ return data
+
class Meta:
model = Patch
fields = ('id', 'url', 'web_url', 'project', 'msgid', 'date', 'name',
@@ -175,8 +183,9 @@ class PatchList(ListAPIView):
def get_queryset(self):
return Patch.objects.all()\
- .prefetch_related('series', 'check_set')\
- .select_related('project', 'state', 'submitter', 'delegate')\
+ .prefetch_related('check_set')\
+ .select_related('project', 'state', 'submitter', 'delegate',
+ 'series')\
.defer('content', 'diff', 'headers')
@@ -188,5 +197,6 @@ class PatchDetail(RetrieveUpdateAPIView):
def get_queryset(self):
return Patch.objects.all()\
- .prefetch_related('series', 'check_set')\
- .select_related('project', 'state', 'submitter', 'delegate')
+ .prefetch_related('check_set')\
+ .select_related('project', 'state', 'submitter', 'delegate',
+ 'series')
diff --git a/patchwork/migrations/0031_add_patch_series_fields.py
b/patchwork/migrations/0031_add_patch_series_fields.py
new file mode 100644
index 00000000..bfe4385c
--- /dev/null
+++ b/patchwork/migrations/0031_add_patch_series_fields.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+from django.db.models import Count
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('patchwork', '0030_add_submission_covering_index'),
+ ]
+
+ operations = [
+ # Add Patch.series_alt, Patch.number fields. This will store the fields
+ # currently stored in SeriesPatch
+ migrations.AddField(
+ model_name='patch',
+ name='number',
+ field=models.PositiveSmallIntegerField(default=None,
help_text=b'The number assigned to this patch in the series', null=True),
+ ),
+ migrations.AddField(
+ model_name='patch',
+ name='series_alt',
+ field=models.ForeignKey(blank=True, null=True,
on_delete=django.db.models.deletion.CASCADE, to='patchwork.Series'),
+ ),
+ migrations.AlterUniqueTogether(
+ name='patch',
+ unique_together=set([('series_alt', 'number')]),
+ ),
+ ]
diff --git
a/patchwork/migrations/0032_migrate_data_from_series_patch_to_patch.py
b/patchwork/migrations/0032_migrate_data_from_series_patch_to_patch.py
new file mode 100644
index 00000000..78e86426
--- /dev/null
+++ b/patchwork/migrations/0032_migrate_data_from_series_patch_to_patch.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+from django.db.models import Count
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('patchwork', '0031_add_patch_series_fields'),
+ ]
+
+ operations = [
+ # Copy SeriesPatch.series, SeriesPatch.number to Patch.series_alt,
+ # Patch.number. Note that there is no uniqueness check here because no
+ # code actually allowed us to save multiple series
+ migrations.RunSQL(
+ """UPDATE patchwork_patch SET series_alt_id =
+ (SELECT series_id from patchwork_seriespatch
+ WHERE patchwork_seriespatch.patch_id =
+ patchwork_patch.submission_ptr_id);
+ UPDATE patchwork_patch SET number =
+ (SELECT number from patchwork_seriespatch
+ WHERE patchwork_seriespatch.patch_id =
+ patchwork_patch.submission_ptr_id);
+ """,
+ """INSERT INTO patchwork_seriespatch
+ (patch_id, series_id, number)
+ SELECT submission_ptr_id, series_alt_id, number
+ FROM patchwork_patch;
+ """,
+ ),
+ ]
diff --git a/patchwork/migrations/0033_remove_patch_series_model.py
b/patchwork/migrations/0033_remove_patch_series_model.py
new file mode 100644
index 00000000..a9ea2e20
--- /dev/null
+++ b/patchwork/migrations/0033_remove_patch_series_model.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('patchwork', '0032_migrate_data_from_series_patch_to_patch'),
+ ]
+
+ operations = [
+ # Remove SeriesPatch
+ migrations.AlterUniqueTogether(
+ name='seriespatch',
+ unique_together=set([]),
+ ),
+ migrations.RemoveField(
+ model_name='seriespatch',
+ name='patch',
+ ),
+ migrations.RemoveField(
+ model_name='seriespatch',
+ name='series',
+ ),
+ migrations.RemoveField(
+ model_name='series',
+ name='patches',
+ ),
+ migrations.DeleteModel(
+ name='SeriesPatch',
+ ),
+ # Now that SeriesPatch has been removed, we can use the now-unused
+ # Patch.series field and add a backreference
+ migrations.RenameField(
+ model_name='patch',
+ old_name='series_alt',
+ new_name='series',
+ ),
+ migrations.AlterField(
+ model_name='patch',
+ name='series',
+ field=models.ForeignKey(blank=True, null=True,
on_delete=django.db.models.deletion.CASCADE, related_name='patches',
related_query_name='patch', to='patchwork.Series'),
+ ),
+ migrations.AlterUniqueTogether(
+ name='patch',
+ unique_together=set([('series', 'number')]),
+ ),
+ # Migrate CoverLetter to OneToOneField as a cover letter can no longer
+ # be assigned to multiple series
+ migrations.AlterField(
+ model_name='series',
+ name='cover_letter',
+ field=models.OneToOneField(null=True,
on_delete=django.db.models.deletion.CASCADE, related_name='series',
to='patchwork.CoverLetter'),
+ ),
+ ]
diff --git a/patchwork/models.py b/patchwork/models.py
index 8731bb2f..14eb74aa 100644
--- a/patchwork/models.py
+++ b/patchwork/models.py
@@ -423,6 +423,15 @@ class Patch(Submission):
# patches in a project without needing to do a JOIN.
patch_project = models.ForeignKey(Project, on_delete=models.CASCADE)
+ # series metadata
+
+ series = models.ForeignKey(
+ 'Series', null=True, blank=True, on_delete=models.CASCADE,
+ related_name='patches', related_query_name='patch')
+ number = models.PositiveSmallIntegerField(
+ default=None, null=True,
+ help_text='The number assigned to this patch in the series')
+
objects = PatchManager()
@staticmethod
@@ -579,6 +588,7 @@ class Patch(Submission):
class Meta:
verbose_name_plural = 'Patches'
base_manager_name = 'objects'
+ unique_together = [('series', 'number')]
indexes = [
# This is a covering index for the /list/ query
@@ -622,19 +632,16 @@ class Comment(EmailMixin, models.Model):
@python_2_unicode_compatible
class Series(FilenameMixin, models.Model):
- """An collection of patches."""
+ """A collection of patches."""
# parent
project = models.ForeignKey(Project, related_name='series', null=True,
blank=True, on_delete=models.CASCADE)
# content
- cover_letter = models.ForeignKey(CoverLetter,
- related_name='series',
- null=True, blank=True,
- on_delete=models.CASCADE)
- patches = models.ManyToManyField(Patch, through='SeriesPatch',
- related_name='series')
+ cover_letter = models.OneToOneField(CoverLetter, related_name='series',
+ null=True,
+ on_delete=models.CASCADE)
# metadata
name = models.CharField(max_length=255, blank=True, null=True,
@@ -700,9 +707,8 @@ class Series(FilenameMixin, models.Model):
self.name = self._format_name(cover)
else:
try:
- name = SeriesPatch.objects.get(series=self,
- number=1).patch.name
- except SeriesPatch.DoesNotExist:
+ name = Patch.objects.get(series=self, number=1).name
+ except Patch.DoesNotExist:
name = None
if self.name == name:
@@ -712,20 +718,16 @@ class Series(FilenameMixin, models.Model):
def add_patch(self, patch, number):
"""Add a patch to the series."""
- # see if the patch is already in this series
- if SeriesPatch.objects.filter(series=self, patch=patch).count():
- # TODO(stephenfin): We may wish to raise an exception here in the
- # future
- return
-
# both user defined names and cover letter-based names take precedence
if not self.name and number == 1:
self.name = patch.name # keep the prefixes for patch-based names
self.save()
- return SeriesPatch.objects.create(series=self,
- patch=patch,
- number=number)
+ patch.series = self
+ patch.number = number
+ patch.save()
+
+ return patch
def get_absolute_url(self):
# TODO(stephenfin): We really need a proper series view
@@ -743,26 +745,6 @@ class Series(FilenameMixin, models.Model):
verbose_name_plural = 'Series'
-@python_2_unicode_compatible
-class SeriesPatch(models.Model):
- """A patch in a series.
-
- Patches can belong to many series. This allows for things like
- auto-completion of partial series.
- """
- patch = models.ForeignKey(Patch, on_delete=models.CASCADE)
- series = models.ForeignKey(Series, on_delete=models.CASCADE)
- number = models.PositiveSmallIntegerField(
- help_text='The number assigned to this patch in the series')
-
- def __str__(self):
- return self.patch.name
-
- class Meta:
- unique_together = [('series', 'patch'), ('series', 'number')]
- ordering = ['number']
-
-
@python_2_unicode_compatible
class SeriesReference(models.Model):
"""A reference found in a series.
diff --git a/patchwork/parser.py b/patchwork/parser.py
index 40a80f26..505f2227 100644
--- a/patchwork/parser.py
+++ b/patchwork/parser.py
@@ -41,7 +41,6 @@ from patchwork.models import Person
from patchwork.models import Project
from patchwork.models import Series
from patchwork.models import SeriesReference
-from patchwork.models import SeriesPatch
from patchwork.models import State
from patchwork.models import Submission
@@ -1043,8 +1042,7 @@ def parse_mail(mail, list_id=None):
# - there is no existing series to assign this patch to, or
# - there is an existing series, but it already has a patch with this
# number in it
- if not series or (
- SeriesPatch.objects.filter(series=series, number=x).count()):
+ if not series or Patch.objects.filter(series=series, number=x).count():
series = Series(project=project,
date=date,
submitter=author,
@@ -1078,6 +1076,8 @@ def parse_mail(mail, list_id=None):
# patch. Don't add unnumbered patches (for example diffs sent
# in reply, or just messages with random refs/in-reply-tos)
if series and x:
+ # TODO(stephenfin): Remove 'series' from the conditional as we will
+ # always have a series
series.add_patch(patch, x)
return patch
diff --git a/patchwork/signals.py b/patchwork/signals.py
index f7b4f547..f6160a87 100644
--- a/patchwork/signals.py
+++ b/patchwork/signals.py
@@ -29,7 +29,6 @@ from patchwork.models import Event
from patchwork.models import Patch
from patchwork.models import PatchChangeNotification
from patchwork.models import Series
-from patchwork.models import SeriesPatch
@receiver(pre_save, sender=Patch)
@@ -147,39 +146,46 @@ def create_patch_delegated_event(sender, instance, raw,
**kwargs):
create_event(instance, orig_patch.delegate, instance.delegate)
-@receiver(post_save, sender=SeriesPatch)
-def create_patch_completed_event(sender, instance, created, raw, **kwargs):
- """Create patch completed event for patches with series."""
+@receiver(pre_save, sender=Patch)
+def create_patch_completed_event(sender, instance, raw, **kwargs):
- def create_event(patch, series):
+ def create_event(patch):
return Event.objects.create(
category=Event.CATEGORY_PATCH_COMPLETED,
project=patch.project,
patch=patch,
- series=series)
+ series=patch.series)
- # don't trigger for items loaded from fixtures or existing items
- if raw or not created:
+ # don't trigger for items loaded from fixtures, new items or items that
+ # (still) don't have a series
+ if raw or not instance.pk or not instance.series:
+ return
+
+ orig_patch = Patch.objects.get(pk=instance.pk)
+
+ # we don't currently allow users to change a series, though this might
+ # change in the future. However, we handle that here nonetheless
+ if orig_patch.series == instance.series:
return
# if dependencies not met, don't raise event. There's also no point raising
# events for successors since they'll have the same issue
- predecessors = SeriesPatch.objects.filter(
+ predecessors = Patch.objects.filter(
series=instance.series, number__lt=instance.number)
if predecessors.count() != instance.number - 1:
return
- create_event(instance.patch, instance.series)
+ create_event(instance)
# if this satisfies dependencies for successor patch, raise events for
# those
count = instance.number + 1
- for successor in SeriesPatch.objects.filter(
+ for successor in Patch.objects.order_by('number').filter(
series=instance.series, number__gt=instance.number):
if successor.number != count:
break
- create_event(successor.patch, successor.series)
+ create_event(successor)
count += 1
@@ -218,15 +224,9 @@ def create_series_created_event(sender, instance, created,
raw, **kwargs):
create_event(instance)
-@receiver(post_save, sender=SeriesPatch)
+@receiver(post_save, sender=Patch)
def create_series_completed_event(sender, instance, created, raw, **kwargs):
- # NOTE(stephenfin): We subscribe to the SeriesPatch.post_save signal
- # instead of Series.m2m_changed to minimize the amount of times this is
- # fired. The m2m_changed signal doesn't support a 'changed' parameter,
- # which we could use to quick skip the signal when a patch is merely
- # updated instead of added to the series.
-
# NOTE(stephenfin): It's actually possible for this event to be fired
# multiple times for a given series. To trigger this case, you would need
# to send an additional patch to already exisiting series. This pattern
@@ -243,5 +243,5 @@ def create_series_completed_event(sender, instance,
created, raw, **kwargs):
if raw or not created:
return
- if instance.series.received_all:
+ if instance.series and instance.series.received_all:
create_event(instance.series)
diff --git a/patchwork/templates/patchwork/download_buttons.html
b/patchwork/templates/patchwork/download_buttons.html
index 32acf26b..21933bd2 100644
--- a/patchwork/templates/patchwork/download_buttons.html
+++ b/patchwork/templates/patchwork/download_buttons.html
@@ -15,22 +15,9 @@
class="btn btn-default" role="button" title="Download cover mbox"
>mbox</a>
{% endif %}
- {% if all_series|length == 1 %}
- {% with all_series|first as series %}
- <a href="{% url 'series-mbox' series_id=series.id %}"
+ {% if submission.series %}
+ <a href="{% url 'series-mbox' series_id=submission.series.id %}"
class="btn btn-default" role="button"
title="Download patch mbox with dependencies">series</a>
- {% endwith %}
- {% elif all_series|length > 1 %}
- <button type="button" class="btn btn-default dropdown-toggle"
- data-toggle="dropdown">
- series <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" role="menu">
- {% for series in all_series %}
- <li><a href="{% url 'series-mbox' series_id=series.id %}"
- >{{ series }}</a></li>
- {% endfor %}
- </ul>
{% endif %}
</div>
diff --git a/patchwork/templates/patchwork/patch-list.html
b/patchwork/templates/patchwork/patch-list.html
index 71c1ba92..9dcee1c8 100644
--- a/patchwork/templates/patchwork/patch-list.html
+++ b/patchwork/templates/patchwork/patch-list.html
@@ -194,13 +194,11 @@ $(document).ready(function() {
</a>
</td>
<td>
- {% with patch.series.all.0 as series %}
- {% if series %}
- <a href="?series={{series.id}}">
- {{ series|truncatechars:100 }}
- </a>
- {% endif %}
- {% endwith %}
+ {% if patch.series %}
+ <a href="?series={{patch.series.id}}">
+ {{ patch.series|truncatechars:100 }}
+ </a>
+ {% endif %}
</td>
<td class="text-nowrap">{{ patch|patch_tags }}</td>
<td class="text-nowrap">{{ patch|patch_checks }}</td>
diff --git a/patchwork/templates/patchwork/submission.html
b/patchwork/templates/patchwork/submission.html
index f03e1408..ceb88af3 100644
--- a/patchwork/templates/patchwork/submission.html
+++ b/patchwork/templates/patchwork/submission.html
@@ -64,25 +64,13 @@ function toggle_div(link_id, headers_id)
</div>
</td>
</tr>
-{% if all_series %}
+{% if submission.series %}
<tr>
<th>Series</th>
<td>
- <div class="patchrelations">
- <ul>
- {% for series in all_series %}
- <li>
- {% if forloop.first %}
- {{ series }}
- {% else %}
- <a href="{% url 'patch-list' project_id=project.linkname %}?series={{
series.id }}">
- {{ series }}
- </a>
- {% endif %}
- </li>
- {% endfor %}
- </ul>
- </div>
+ <a href="{% url 'patch-list' project_id=project.linkname %}?series={{
submission.series.id }}">
+ {{ submission.series }}
+ </a>
</td>
</tr>
<tr>
@@ -92,9 +80,8 @@ function toggle_div(link_id, headers_id)
href="javascript:toggle_div('togglepatchrelations', 'patchrelations')"
>show</a>
<div id="patchrelations" class="patchrelations" style="display:none;">
- {% for series in all_series %}
<ul>
- {% with series.cover_letter as cover %}
+ {% with submission.series.cover_letter as cover %}
<li>
{% if cover %}
{% if cover == submission %}
@@ -107,7 +94,7 @@ function toggle_div(link_id, headers_id)
{% endif %}
</li>
{% endwith %}
- {% for sibling in series.patches.all %}
+ {% for sibling in submission.series.patches.all %}
<li>
{% if sibling == submission %}
{{ sibling.name|default:"[no subject]"|truncatechars:100 }}
@@ -119,7 +106,6 @@ function toggle_div(link_id, headers_id)
</li>
{% endfor %}
</ul>
- {% endfor %}
</div>
</td>
</tr>
diff --git a/patchwork/tests/test_detail.py b/patchwork/tests/test_detail.py
index f119da05..96320c10 100644
--- a/patchwork/tests/test_detail.py
+++ b/patchwork/tests/test_detail.py
@@ -25,7 +25,6 @@ from django.urls import reverse
from patchwork.tests.utils import create_comment
from patchwork.tests.utils import create_cover
from patchwork.tests.utils import create_patch
-from patchwork.tests.utils import create_series
class CoverLetterViewTest(TestCase):
@@ -51,21 +50,6 @@ class PatchViewTest(TestCase):
response = self.client.get(requested_url)
self.assertRedirects(response, redirect_url)
- def test_series_dropdown(self):
- patch = create_patch()
- series = [create_series() for x in range(5)]
-
- for series_ in series:
- series_.add_patch(patch, 1)
-
- response = self.client.get(
- reverse('patch-detail', kwargs={'patch_id': patch.id}))
-
- for series_ in series:
- self.assertContains(
- response,
- reverse('series-mbox', kwargs={'series_id': series_.id}))
-
class CommentRedirectTest(TestCase):
diff --git a/patchwork/tests/test_events.py b/patchwork/tests/test_events.py
index 70d563de..49c45158 100644
--- a/patchwork/tests/test_events.py
+++ b/patchwork/tests/test_events.py
@@ -48,8 +48,8 @@ class PatchCreateTest(_BaseTestCase):
"""No series, so patch dependencies implicitly exist."""
patch = utils.create_patch()
- # This should raise both the CATEGORY_PATCH_CREATED and
- # CATEGORY_PATCH_COMPLETED events as there are no specific dependencies
+ # This should raise the CATEGORY_PATCH_CREATED event only as there is
+ # no series
events = _get_events(patch=patch)
self.assertEqual(events.count(), 1)
self.assertEqual(events[0].category, Event.CATEGORY_PATCH_CREATED)
@@ -71,6 +71,13 @@ class PatchCreateTest(_BaseTestCase):
self.assertEventFields(events[0])
self.assertEventFields(events[1])
+ # This shouldn't be affected by another update to the patch
+ series_patch.patch.commit_ref = 'aac76f0b0f8dd657ff07bb'
+ series_patch.patch.save()
+
+ events = _get_events(patch=series_patch.patch)
+ self.assertEqual(events.count(), 2)
+
def test_patch_dependencies_out_of_order(self):
series = utils.create_series()
series_patch_3 = utils.create_series_patch(series=series, number=3)
diff --git a/patchwork/tests/test_series.py b/patchwork/tests/test_series.py
index 8b71fef1..d012568b 100644
--- a/patchwork/tests/test_series.py
+++ b/patchwork/tests/test_series.py
@@ -87,7 +87,15 @@ class _BaseTestCase(TestCase):
patches_ = patches[start_idx:end_idx]
for patch in patches_:
- self.assertEqual(patch.series.first(), series[idx])
+ self.assertEqual(patch.series, series[idx])
+
+ # TODO(stephenfin): Rework this function into two different
+ # functions - we're clearly not always testing patches here
+ if isinstance(patch, models.Patch):
+ self.assertEqual(series[idx].patches.get(id=patch.id),
+ patch)
+ else:
+ self.assertEqual(series[idx].cover_letter, patch)
start_idx = end_idx
@@ -531,7 +539,7 @@ class SeriesTotalTest(_BaseTestCase):
self.assertSerialized(patches, [1])
self.assertSerialized(covers, [1])
- series = patches[0].series.first()
+ series = patches[0].series
self.assertFalse(series.received_all)
def test_complete(self):
@@ -551,7 +559,7 @@ class SeriesTotalTest(_BaseTestCase):
self.assertSerialized(covers, [1])
self.assertSerialized(patches, [2])
- series = patches[0].series.first()
+ series = patches[0].series
self.assertTrue(series.received_all)
def test_extra_patches(self):
@@ -572,7 +580,7 @@ class SeriesTotalTest(_BaseTestCase):
self.assertSerialized(covers, [1])
self.assertSerialized(patches, [3])
- series = patches[0].series.first()
+ series = patches[0].series
self.assertTrue(series.received_all)
@@ -653,13 +661,13 @@ class SeriesNameTestCase(TestCase):
cover = self._parse_mail(mbox[0])
cover_name = 'A sample series'
- self.assertEqual(cover.series.first().name, cover_name)
+ self.assertEqual(cover.series.name, cover_name)
self._parse_mail(mbox[1])
- self.assertEqual(cover.series.first().name, cover_name)
+ self.assertEqual(cover.series.name, cover_name)
self._parse_mail(mbox[2])
- self.assertEqual(cover.series.first().name, cover_name)
+ self.assertEqual(cover.series.name, cover_name)
mbox.close()
@@ -677,7 +685,7 @@ class SeriesNameTestCase(TestCase):
mbox = self._get_mbox('base-no-cover-letter.mbox')
patch = self._parse_mail(mbox[0])
- series = patch.series.first()
+ series = patch.series
self.assertEqual(series.name, patch.name)
self._parse_mail(mbox[1])
@@ -701,13 +709,13 @@ class SeriesNameTestCase(TestCase):
mbox = self._get_mbox('base-out-of-order.mbox')
patch = self._parse_mail(mbox[0])
- self.assertIsNone(patch.series.first().name)
+ self.assertIsNone(patch.series.name)
patch = self._parse_mail(mbox[1])
- self.assertEqual(patch.series.first().name, patch.name)
+ self.assertEqual(patch.series.name, patch.name)
cover = self._parse_mail(mbox[2])
- self.assertEqual(cover.series.first().name, 'A sample series')
+ self.assertEqual(cover.series.name, 'A sample series')
mbox.close()
@@ -726,7 +734,7 @@ class SeriesNameTestCase(TestCase):
"""
mbox = self._get_mbox('base-out-of-order.mbox')
- series = self._parse_mail(mbox[0]).series.first()
+ series = self._parse_mail(mbox[0]).series
self.assertIsNone(series.name)
series_name = 'My custom series name'
diff --git a/patchwork/tests/utils.py b/patchwork/tests/utils.py
index 00eb6c2a..be8c62a3 100644
--- a/patchwork/tests/utils.py
+++ b/patchwork/tests/utils.py
@@ -33,7 +33,6 @@ from patchwork.models import Patch
from patchwork.models import Person
from patchwork.models import Project
from patchwork.models import Series
-from patchwork.models import SeriesPatch
from patchwork.models import SeriesReference
from patchwork.models import State
from patchwork.tests import TEST_PATCH_DIR
@@ -242,17 +241,24 @@ def create_series(**kwargs):
def create_series_patch(**kwargs):
- """Create 'SeriesPatch' object."""
+ """Create 'Patch' object and associate with a series."""
+ # TODO(stephenfin): Remove this and all callers
num = 1 if 'series' not in kwargs else kwargs['series'].patches.count() + 1
+ if 'number' in kwargs:
+ num = kwargs['number']
- values = {
- 'series': create_series() if 'series' not in kwargs else None,
- 'number': num,
- 'patch': create_patch() if 'patch' not in kwargs else None,
- }
- values.update(**kwargs)
+ series = create_series() if 'series' not in kwargs else kwargs['series']
+ patch = create_patch() if 'patch' not in kwargs else kwargs['patch']
+
+ series.add_patch(patch, num)
+
+ class SeriesPatch(object):
+ """Simple wrapper to avoid needing to update all tests at once."""
+ def __init__(self, series, patch):
+ self.series = series
+ self.patch = patch
- return SeriesPatch.objects.create(**values)
+ return SeriesPatch(series=series, patch=patch)
def create_series_reference(**kwargs):
diff --git a/patchwork/views/cover.py b/patchwork/views/cover.py
index 62b3d6b2..be5db2c2 100644
--- a/patchwork/views/cover.py
+++ b/patchwork/views/cover.py
@@ -50,7 +50,6 @@ def cover_detail(request, cover_id):
comments = comments.only('submitter', 'date', 'id', 'content',
'submission')
context['comments'] = comments
- context['all_series'] = cover.series.all().order_by('-date')
return render(request, 'patchwork/submission.html', context)
diff --git a/patchwork/views/patch.py b/patchwork/views/patch.py
index 0aa9fc65..9fed4312 100644
--- a/patchwork/views/patch.py
+++ b/patchwork/views/patch.py
@@ -119,7 +119,6 @@ def patch_detail(request, patch_id):
'submission')
context['comments'] = comments
- context['all_series'] = patch.series.all().order_by('-date')
context['checks'] = patch.check_set.all().select_related('user')
context['submission'] = patch
context['patchform'] = form
@@ -146,7 +145,7 @@ def patch_mbox(request, patch_id):
response = HttpResponse(content_type='text/plain')
if series_id:
- if not patch.series.count():
+ if not patch.series:
raise Http404('Patch does not have an associated series. This is '
'because the patch was processed with an older '
'version of Patchwork. It is not possible to '
diff --git a/patchwork/views/utils.py b/patchwork/views/utils.py
index 3bf7af3c..bfcf6aba 100644
--- a/patchwork/views/utils.py
+++ b/patchwork/views/utils.py
@@ -32,7 +32,6 @@ from django.utils import six
from patchwork.models import Comment
from patchwork.models import Patch
-from patchwork.models import Series
if settings.ENABLE_REST_API:
from rest_framework.authtoken.models import Token
@@ -142,26 +141,22 @@ def series_patch_to_mbox(patch, series_id):
Returns:
A string for the mbox file.
"""
- if series_id == '*':
- series = patch.series.order_by('-date').first()
- else:
+ if series_id != '*':
try:
series_id = int(series_id)
except ValueError:
raise Http404('Expected integer series value or *. Received: %r' %
series_id)
- try:
- series = patch.series.get(id=series_id)
- except Series.DoesNotExist:
+ if patch.series.id != series_id:
raise Http404('Patch does not belong to series %d' % series_id)
mbox = []
# get the series-ified patch
- number = series.seriespatch_set.get(patch=patch).number
- for dep in series.seriespatch_set.filter(number__lt=number):
- mbox.append(patch_to_mbox(dep.patch))
+ for dep in patch.series.patches.filter(
+ number__lt=patch.number).order_by('number'):
+ mbox.append(patch_to_mbox(dep))
mbox.append(patch_to_mbox(patch))
@@ -179,7 +174,7 @@ def series_to_mbox(series):
"""
mbox = []
- for dep in series.seriespatch_set.all():
+ for dep in series.patches.all().order_by('number'):
mbox.append(patch_to_mbox(dep.patch))
return '\n'.join(mbox)
--
2.17.1
_______________________________________________
Patchwork mailing list
Patchwork@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/patchwork
