Merge branch 'postgres:main' into main

Author: ChiragAJain

.github/workflows/ci.yaml

@@ -27,3 +27,9 @@ jobs:
 
       - name: Run Biome
         run: biome ci .
+
+      - name: Install djhtml
+        run: pip install djhtml
+
+      - name: Run djhtml
+        run: djhtml pgcommitfest/*/templates/*.html pgcommitfest/*/templates/*.inc --tabwidth=1 --check

Makefile

@@ -1,6 +1,7 @@
 format:
 	ruff format
 	npx @biomejs/biome format --write
+	djhtml pgcommitfest/*/templates/*.html pgcommitfest/*/templates/*.inc --tabwidth=1
 
 lint:
 	ruff check

README.md

@@ -79,12 +79,12 @@ admin interface, go back to the main interface. You're now logged in.
 
 ## Contributing
 
-Code formatting and linting is done using [`ruff`] and [`biome`]. You can run
-formatting using `make format`. Linting can be done using `make lint` and
-automatic fixing of linting errors can be done using `make lint-fix` or `make
-lint-fix-unsafe` (unsafe fixes can slightly change program behaviour, but often
-the fixed behaviour is the one you intended). You can also run both `make
-format` and `make lint-fix-unsafe` together by using `make fix`. CI
+Code formatting and linting is done using [`ruff`], [`biome`], and [`djhtml`].
+You can run formatting using `make format`. Linting can be done using `make
+lint` and automatic fixing of linting errors can be done using `make lint-fix`
+or `make lint-fix-unsafe` (unsafe fixes can slightly change program behaviour,
+but often the fixed behaviour is the one you intended). You can also run both
+`make format` and `make lint-fix-unsafe` together by using `make fix`. CI
 automatically checks that you adhere to these coding standards.
 
 You can install the git pre-commit hook to help you adhere to the codestyle:
@@ -95,6 +95,7 @@ ln -s ../../tools/githook/pre-commit .git/hooks/
 
 [`ruff`]: https://docs.astral.sh/ruff/
 [`biome`]: https://biomejs.dev/
+[`djhtml`]: https://github.com/rtts/djhtml
 
 ### Discord
 

dev_requirements.txt

@@ -2,3 +2,4 @@
 uwsgi
 pycodestyle
 ruff
+djhtml

media/commitfest/css/commitfest.css

@@ -30,6 +30,12 @@ div.form-group div.controls ul li label input {
 }
 div.form-group div.controls input[type="checkbox"] {
     width: 10px;
+    height: unset;
+    display: inline-block;
+}
+div.form-group div.controls > div.form-control:has(input[type="checkbox"]) {
+    display: flex;
+    gap: 8px;
 }
 
 div.form-group div.controls input.threadpick-input {
@@ -81,3 +87,7 @@ div.form-group div.controls input.threadpick-input {
     font-weight: bold;
     color: red;
 }
+
+.search-bar {
+    display: inline-block;
+}

pgcommitfest/commitfest/fixtures/commitfest_data.json

@@ -216,6 +216,27 @@
         ]
     }
 },
+{
+    "model": "commitfest.patch",
+    "pk": 7,
+    "fields": {
+        "name": "Old BufferDesc refcount in PrintBufferDescs and PrintPinnedBufs",
+        "topic": 3,
+        "wikilink": "",
+        "gitlink": "",
+        "targetversion": null,
+        "committer": null,
+        "created": "2025-03-01T22:27:53.214",
+        "modified": "2025-03-01T22:27:53.221",
+        "lastmail": "2025-01-18T07:14:02",
+        "authors": [],
+        "reviewers": [],
+        "subscribers": [],
+        "mailthread_set": [
+            7
+        ]
+    }
+},
 {
     "model": "commitfest.patchoncommitfest",
     "pk": 1,
@@ -293,6 +314,17 @@
         "status": 6
     }
 },
+{
+    "model": "commitfest.patchoncommitfest",
+    "pk": 8,
+    "fields": {
+        "patch": 7,
+        "commitfest": 2,
+        "enterdate": "2025-03-01T22:27:53.214",
+        "leavedate": null,
+        "status": 1
+    }
+},
 {
     "model": "commitfest.patchhistory",
     "pk": 1,
@@ -480,6 +512,28 @@
         "what": "Closed in commitfest Sample In Progress Commitfest with status: Rejected"
     }
 },
+{
+    "model": "commitfest.patchhistory",
+    "pk": 18,
+    "fields": {
+        "patch": 7,
+        "date": "2025-03-01T22:27:53.215",
+        "by": 1,
+        "by_cfbot": false,
+        "what": "Created patch record"
+    }
+},
+{
+    "model": "commitfest.patchhistory",
+    "pk": 19,
+    "fields": {
+        "patch": 7,
+        "date": "2025-03-01T22:27:53.218",
+        "by": 1,
+        "by_cfbot": false,
+        "what": "Attached mail thread example@message-31"
+    }
+},
 {
     "model": "commitfest.mailthread",
     "pk": 1,
@@ -564,6 +618,20 @@
         "latestmsgid": "example@message-16"
     }
 },
+{
+    "model": "commitfest.mailthread",
+    "pk": 7,
+    "fields": {
+        "messageid": "example@message-31",
+        "subject": "Re: Old BufferDesc refcount in PrintBufferDescs and PrintPinnedBufs",
+        "firstmessage": "2025-01-18T07:14:02",
+        "firstauthor": "[email protected]",
+        "latestmessage": "2025-01-18T07:14:02",
+        "latestauthor": "[email protected]",
+        "latestsubject": "Re: Old BufferDesc refcount in PrintBufferDescs and PrintPinnedBufs",
+        "latestmsgid": "example@message-31"
+    }
+},
 {
     "model": "commitfest.patchstatus",
     "pk": 1,
@@ -638,6 +706,7 @@
         "apply_url": "http://cfbot.cputube.org/patch_4573.log",
         "status": "finished",
         "needs_rebase_since": null,
+        "failing_since": null,
         "created": "2025-01-26T22:06:02.980",
         "modified": "2025-01-29T22:50:37.805",
         "version": "",
@@ -657,10 +726,11 @@
         "commit_id": null,
         "apply_url": "http://cfbot.cputube.org/patch_4573.log",
         "status": "failed",
-        "needs_rebase_since": null,
+        "needs_rebase_since": "2025-03-01T22:30:42",
+        "failing_since": "2025-02-01T22:30:42",
         "created": "2025-01-26T22:11:09.961",
-        "modified": "2025-01-26T22:20:39.372",
-        "version": null,
+        "modified": "2025-03-01T22:59:14.717",
+        "version": "",
         "patch_count": null,
         "first_additions": null,
         "first_deletions": null,
@@ -678,8 +748,9 @@
         "apply_url": "http://cfbot.cputube.org/patch_4748.log",
         "status": "failed",
         "needs_rebase_since": null,
+        "failing_since": "2025-03-01T23:18:06",
         "created": "2025-01-26T22:22:46.602",
-        "modified": "2025-01-29T22:58:51.032",
+        "modified": "2025-03-01T23:18:10.856",
         "version": "",
         "patch_count": 3,
         "first_additions": 345,
@@ -698,6 +769,7 @@
         "apply_url": "http://cfbot.cputube.org/patch_4748.log",
         "status": "testing",
         "needs_rebase_since": null,
+        "failing_since": null,
         "created": "2025-01-31T13:32:22.017",
         "modified": "2025-01-31T13:32:22.017",
         "version": "",
@@ -708,6 +780,27 @@
         "all_deletions": 14
     }
 },
+{
+    "model": "commitfest.cfbotbranch",
+    "pk": 7,
+    "fields": {
+        "branch_id": 12,
+        "branch_name": "cf/7",
+        "commit_id": "efg123",
+        "apply_url": "http://cfbot.cputube.org/patch_7.log",
+        "status": "timeout",
+        "needs_rebase_since": null,
+        "failing_since": "2025-03-01T22:29:07",
+        "created": "2025-03-01T22:29:25.461",
+        "modified": "2025-03-01T22:30:14.495",
+        "version": "",
+        "patch_count": 1,
+        "first_additions": 1,
+        "first_deletions": 2,
+        "all_additions": 1,
+        "all_deletions": 2
+    }
+},
 {
     "model": "commitfest.cfbottask",
     "pk": 1,

pgcommitfest/commitfest/forms.py

@@ -1,6 +1,5 @@
 from django import forms
 from django.contrib.auth.models import User
-from django.db.models import Q
 from django.forms import ValidationError
 from django.forms.widgets import HiddenInput
 from django.http import Http404
@@ -11,36 +10,55 @@
 
 
 class CommitFestFilterForm(forms.Form):
+    selectize_fields = {
+        "author": "/lookups/user",
+        "reviewer": "/lookups/user",
+    }
+
     text = forms.CharField(max_length=50, required=False)
     status = forms.ChoiceField(required=False)
     targetversion = forms.ChoiceField(required=False)
-    author = forms.ChoiceField(required=False)
-    reviewer = forms.ChoiceField(required=False)
+    author = forms.ChoiceField(required=False, label="Author (type to search)")
+    reviewer = forms.ChoiceField(required=False, label="Reviewer (type to search)")
     sortkey = forms.IntegerField(required=False)
 
-    def __init__(self, cf, *args, **kwargs):
-        super(CommitFestFilterForm, self).__init__(*args, **kwargs)
+    def __init__(self, data, *args, **kwargs):
+        super(CommitFestFilterForm, self).__init__(data, *args, **kwargs)
 
         self.fields["sortkey"].widget = forms.HiddenInput()
 
         c = [(-1, "* All")] + list(PatchOnCommitFest._STATUS_CHOICES)
         self.fields["status"] = forms.ChoiceField(choices=c, required=False)
 
-        q = Q(patch_author__commitfests=cf) | Q(patch_reviewer__commitfests=cf)
-        userchoices = [(-1, "* All"), (-2, "* None"), (-3, "* Yourself")] + [
-            (u.id, "%s %s (%s)" % (u.first_name, u.last_name, u.username))
-            for u in User.objects.filter(q)
-            .distinct()
-            .order_by("first_name", "last_name")
-        ]
+        userchoices = [(-1, "* All"), (-2, "* None"), (-3, "* Yourself")]
+
+        selected_user_ids = set()
+        if data and "author" in data:
+            try:
+                selected_user_ids.add(int(data["author"]))
+            except ValueError:
+                pass
+
+        if data and "reviewer" in data:
+            try:
+                selected_user_ids.add(int(data["reviewer"]))
+            except ValueError:
+                pass
+
+        if selected_user_ids:
+            userchoices.extend(
+                (u.id, f"{u.first_name} {u.last_name} ({u.username})")
+                for u in User.objects.filter(pk__in=selected_user_ids)
+            )
+
         self.fields["targetversion"] = forms.ChoiceField(
             choices=[("-1", "* All"), ("-2", "* None")]
             + [(v.id, v.version) for v in TargetVersion.objects.all()],
             required=False,
             label="Target version",
         )
-        self.fields["author"] = forms.ChoiceField(choices=userchoices, required=False)
-        self.fields["reviewer"] = forms.ChoiceField(choices=userchoices, required=False)
+        self.fields["author"].choices = userchoices
+        self.fields["reviewer"].choices = userchoices
 
         for f in (
             "status",
@@ -51,7 +69,7 @@ def __init__(self, cf, *args, **kwargs):
 
 
 class PatchForm(forms.ModelForm):
-    selectize_multiple_fields = {
+    selectize_fields = {
         "authors": "/lookups/user",
         "reviewers": "/lookups/user",
     }
@@ -77,7 +95,7 @@ def __init__(self, *args, **kwargs):
         )
 
         # Selectize multiple fields -- don't pre-populate everything
-        for field, url in list(self.selectize_multiple_fields.items()):
+        for field, url in list(self.selectize_fields.items()):
             # If this is a postback of a selectize field, it may contain ids that are not currently
             # stored in the field. They must still be among the *allowed* values of course, which
             # are handled by the existing queryset on the field.
@@ -94,8 +112,8 @@ def __init__(self, *args, **kwargs):
             self.fields[field].queryset = self.fields[field].queryset.filter(
                 pk__in=set(vals)
             )
-            self.fields[field].label_from_instance = lambda u: "{} ({})".format(
-                u.username, u.get_full_name()
+            self.fields[field].label_from_instance = (
+                lambda u: f"{u.get_full_name()} ({u.username})"
             )
 
         # Only allow modifying reviewers and committers if the patch is closed.

pgcommitfest/commitfest/lookups.py

@@ -25,7 +25,7 @@ def userlookup(request):
                 "values": [
                     {
                         "id": u.id,
-                        "value": "{} ({})".format(u.username, u.get_full_name()),
+                        "value": f"{u.get_full_name()} ({u.username})",
                     }
                     for u in users
                 ],

pgcommitfest/commitfest/migrations/0001_initial.py

@@ -170,7 +170,7 @@ class Migration(migrations.Migration):
                 ("wikilink", models.URLField(default="", null=False, blank=True)),
                 ("gitlink", models.URLField(default="", null=False, blank=True)),
                 ("created", models.DateTimeField(auto_now_add=True)),
-                ("modified", models.DateTimeField()),
+                ("modified", models.DateTimeField(auto_now_add=True)),
                 ("lastmail", models.DateTimeField(null=True, blank=True)),
                 (
                     "authors",

pgcommitfest/commitfest/migrations/0010_add_failing_since_column.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.19 on 2025-03-01 13:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("commitfest", "0009_extra_branch_fields"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="cfbotbranch",
+            name="failing_since",
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]