Skip to content

Commit 4b1450c

Browse files
committed
parser: Implement cover->patch label inheritance
Labels parsed out of a cover letter are automatically assigned to all patches in the series, even if the cover letter comes in late.
1 parent 0b29a82 commit 4b1450c

4 files changed

Lines changed: 131 additions & 2 deletions

File tree

‎patchwork/management/commands/relabel.py‎

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from email.parser import HeaderParser
99

10-
from patchwork.models import Label, Patch
10+
from patchwork.models import Label, Patch, Cover, Series
1111
from patchwork.parser import clean_subject
1212

1313

@@ -17,7 +17,7 @@ def get_labels_per_project():
1717
global_labels = list(Label.objects.filter(project_id=None).all())
1818

1919
labels_per_project = {}
20-
for label in Label.objects.filter(project_id__isnull=True).all():
20+
for label in Label.objects.filter(project_id__isnull=False).all():
2121
labels_list = labels_per_project.get(label.project_id, [])
2222
labels_list.append(label)
2323
labels_per_project[label.project_id] = labels_list
@@ -134,9 +134,63 @@ def update_patches(self, projects):
134134

135135
self.flush(Patch)
136136

137+
def update_covers(self, projects):
138+
self.reset()
139+
140+
query = Cover.objects.all().only('id', 'headers', 'project_id')
141+
142+
if projects:
143+
query = query.filter(project__listid__in=projects)
144+
145+
count = query.count()
146+
147+
for i, cover in enumerate(query.iterator(chunk_size=1000)):
148+
project_labels = self.labels_per_project.get(
149+
cover.project_id, self.global_labels
150+
)
151+
152+
name, cleaned_prefixes = get_name_and_labels(
153+
cover.headers, [label.name for label in project_labels]
154+
)
155+
if name is None or cleaned_prefixes is None:
156+
continue
157+
158+
for label in project_labels:
159+
if (
160+
label.name in cleaned_prefixes
161+
and label not in cover.labels.all()
162+
):
163+
self.labels_to_add.append(
164+
Cover.labels.through(
165+
cover_id=cover.id, label_id=label.id
166+
)
167+
)
168+
self.patches_to_update_ids.add(cover.id)
169+
170+
if cover.name != name:
171+
cover.name = name[:255]
172+
self.patches_to_update.append(cover)
173+
174+
series = Series.objects.get(cover_letter=cover)
175+
series.name = name[:255]
176+
self.series_to_update.append(series)
177+
178+
if (i % 100) == 0:
179+
self.stdout.write('%06d/%06d\r' % (i, count), ending='')
180+
self.stdout.flush()
181+
182+
if len(self.patches_to_update) >= 1000:
183+
self.flush(Cover)
184+
185+
self.flush(Cover)
186+
137187
def handle(self, *args, **options):
138188
self.labels_per_project, self.global_labels = get_labels_per_project()
139189

190+
self.stdout.write('\nupdating covers')
191+
192+
self.update_covers(options['projects'])
193+
140194
self.stdout.write('\nupdating patches')
141195

142196
self.update_patches(options['projects'])

‎patchwork/models.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,6 +1120,12 @@ def add_cover_letter(self, cover):
11201120

11211121
self.save()
11221122

1123+
labels = [label.id for label in cover.labels.all()]
1124+
if len(labels) != 0:
1125+
for patch in Patch.objects.filter(series=self).all():
1126+
patch.labels.add(*labels)
1127+
patch.save()
1128+
11231129
def add_patch(self, patch, number):
11241130
"""Add a patch to the series."""
11251131
# both user defined names and cover letter-based names take precedence
@@ -1129,6 +1135,9 @@ def add_patch(self, patch, number):
11291135

11301136
patch.series = self
11311137
patch.number = number
1138+
if self.cover_letter:
1139+
labels = [label.id for label in self.cover_letter.labels.all()]
1140+
patch.labels.add(*labels)
11321141
patch.save()
11331142

11341143
return patch

‎patchwork/parser.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,6 +1477,8 @@ def parse_mail(mail, list_id=None):
14771477
submitter=author,
14781478
content=message,
14791479
)
1480+
if labels:
1481+
cover_letter.labels.set(labels)
14801482

14811483
logger.debug('Cover letter saved')
14821484

‎patchwork/tests/unit/test_parser.py‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1659,3 +1659,67 @@ def test_local_global_labels(self):
16591659
patch = self.create_email('[PATCH,RFC] test subject', self.project2)
16601660
self.cmp_labels(patch, [self.label_rfc_global])
16611661
self.assertEqual(patch.name, 'test subject')
1662+
1663+
def test_cover_patch_inheritance(self):
1664+
cover_msgid = make_msgid()
1665+
cover_email = create_email(
1666+
'test cover letter',
1667+
msgid=cover_msgid,
1668+
subject='[RFC,label2,0/2] a cover letter',
1669+
listid=self.project.listid,
1670+
)
1671+
_parse_mail(cover_email)
1672+
cover = Cover.objects.filter(msgid=cover_msgid)[0]
1673+
self.cmp_labels(cover, [self.label_rfc, self.label2])
1674+
1675+
patch1_msgid = make_msgid()
1676+
patch = self.create_email(
1677+
'[label,PATCH,1/2] test patch',
1678+
self.project,
1679+
in_reply_to=cover_msgid,
1680+
msgid=patch1_msgid,
1681+
)
1682+
self.cmp_labels(patch, [self.label, self.label_rfc, self.label2])
1683+
1684+
patch2 = self.create_email(
1685+
'[PATCH,2/2] test patch',
1686+
self.project,
1687+
in_reply_to=patch1_msgid,
1688+
)
1689+
self.cmp_labels(patch2, [self.label_rfc, self.label2])
1690+
1691+
def test_cover_patch_inheritance_out_of_order(self):
1692+
cover_msgid = make_msgid()
1693+
1694+
patch1_msgid = make_msgid()
1695+
patch1 = self.create_email(
1696+
'[label,PATCH,1/2] test patch',
1697+
self.project,
1698+
in_reply_to=cover_msgid,
1699+
msgid=patch1_msgid,
1700+
)
1701+
self.cmp_labels(patch1, [self.label])
1702+
1703+
patch2 = self.create_email(
1704+
'[PATCH,2/2] test patch',
1705+
self.project,
1706+
in_reply_to=patch1_msgid,
1707+
)
1708+
self.cmp_labels(patch2, [])
1709+
1710+
cover_email = create_email(
1711+
'test cover letter',
1712+
msgid=cover_msgid,
1713+
subject='[RFC,0/2] a cover letter',
1714+
listid=self.project.listid,
1715+
)
1716+
_parse_mail(cover_email)
1717+
cover = Cover.objects.get(msgid=cover_msgid)
1718+
1719+
self.cmp_labels(cover, [self.label_rfc])
1720+
1721+
patch1 = Patch.objects.get(msgid=patch1_msgid)
1722+
self.cmp_labels(patch1, [self.label, self.label_rfc])
1723+
1724+
patch2 = Patch.objects.get(msgid=patch2.msgid)
1725+
self.cmp_labels(patch2, [self.label_rfc])

0 commit comments

Comments
 (0)