Patch Detail
Show a patch.
GET /api/1.1/patches/20819/?format=api
{ "id": 20819, "url": "https://patchwork.libcamera.org/api/1.1/patches/20819/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20819/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240807121516.13608-4-laurent.pinchart@ideasonboard.com>", "date": "2024-08-07T12:15:16", "name": "[v2,3/3] utils: checkstyle.py: Fix trailer parsing for commits with changelogs", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "67d45b648cfb0d4611591e5ef350a40b843f158b", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20819/mbox/", "series": [ { "id": 4494, "url": "https://patchwork.libcamera.org/api/1.1/series/4494/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4494", "date": "2024-08-07T12:15:13", "name": "utils: checkstyle.py: Improve trailer validation", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4494/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20819/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20819/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5B180BE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 7 Aug 2024 12:15:49 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E023663394;\n\tWed, 7 Aug 2024 14:15:48 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1537463394\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Aug 2024 14:15:44 +0200 (CEST)", "from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2AD9A96C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Aug 2024 14:14:51 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"US0EgPQT\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1723032891;\n\tbh=IuJ0yCW+peWoerrN/voMkeXiPtFYVGltBzzgK0/Qx6o=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=US0EgPQTvSxBL/dQLtNO01zih0IBLmtyuR7LHVIFr3mOr645jcOt63qjvbPPpgT+A\n\txy8yUEIrEX3lVhUz4t0q/nEZwikwj3Tf9Y+qKDwP+gs0DZDdT1K0QK2Tqaj8Wf09mW\n\tdZ02IUR4mq/3EaVBEzQCKQ0QZ0ib35bNsAvMgVok=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH v2 3/3] utils: checkstyle.py: Fix trailer parsing for commits\n\twith changelogs", "Date": "Wed, 7 Aug 2024 15:15:16 +0300", "Message-ID": "<20240807121516.13608-4-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.44.2", "In-Reply-To": "<20240807121516.13608-1-laurent.pinchart@ideasonboard.com>", "References": "<20240807121516.13608-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Trailers are extracted from commits using the '(trailers:*)' formatting\nspecifier. git ignores dividers when doing so, as if the --no-divider\noptions was passed to git-interpret-trailers. This prevents trailers\nfrom being located when the patch contains a local changelog.\n\nThere is unfortuantely no 'no-no-divider' option to the trailers format\nspecifier. Fix the issue by extracting trailers with\ngit-interpret-trailers, that gives better control of the parsing.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n utils/checkstyle.py | 26 +++++++++++++-------------\n 1 file changed, 13 insertions(+), 13 deletions(-)", "diff": "diff --git a/utils/checkstyle.py b/utils/checkstyle.py\nindex 560a2c1e8c58..dae5d518920a 100755\n--- a/utils/checkstyle.py\n+++ b/utils/checkstyle.py\n@@ -216,28 +216,28 @@ class Commit:\n self._trailers = []\n self._parse()\n \n- def _parse_trailers(self, lines):\n- for index in range(2, len(lines)):\n- line = lines[index]\n- if not line:\n- break\n+ def _parse_trailers(self):\n+ proc_show = subprocess.run(['git', 'show', '--format=%b',\n+ '--no-patch', self.commit],\n+ stdout=subprocess.PIPE)\n+ trailers = subprocess.run(['git', 'interpret-trailers', '--parse'],\n+ input=proc_show.stdout,\n+ stdout=subprocess.PIPE).stdout.decode('utf-8')\n \n- self._trailers.append(line)\n-\n- return index\n+ self._trailers = trailers.splitlines()\n \n def _parse(self):\n # Get the commit title and list of files.\n- ret = subprocess.run(['git', 'show', '--format=%an <%ae>%n%s%n%(trailers:only,unfold)',\n+ ret = subprocess.run(['git', 'show', '--format=%an <%ae>%n%s',\n '--name-status', self.commit],\n stdout=subprocess.PIPE).stdout.decode('utf-8')\n lines = ret.splitlines()\n \n self._author = lines[0]\n self._title = lines[1]\n+ self._files = [CommitFile(f) for f in lines[2:] if f]\n \n- index = self._parse_trailers(lines)\n- self._files = [CommitFile(f) for f in lines[index:] if f]\n+ self._parse_trailers()\n \n def files(self, filter='AMR'):\n return [f.filename for f in self._files if f.status in filter]\n@@ -288,7 +288,7 @@ class Amendment(Commit):\n \n def _parse(self):\n # Create a title using HEAD commit and parse the trailers.\n- ret = subprocess.run(['git', 'show', '--format=%an <%ae>%n%H %s%n%(trailers:only,unfold)',\n+ ret = subprocess.run(['git', 'show', '--format=%an <%ae>%n%H %s',\n '--no-patch'],\n stdout=subprocess.PIPE).stdout.decode('utf-8')\n lines = ret.splitlines()\n@@ -296,7 +296,7 @@ class Amendment(Commit):\n self._author = lines[0]\n self._title = 'Amendment of ' + lines[1]\n \n- self._parse_trailers(lines)\n+ self._parse_trailers()\n \n # Extract the list of modified files\n ret = subprocess.run(['git', 'diff', '--staged', '--name-status', 'HEAD~'],\n", "prefixes": [ "v2", "3/3" ] }