[{"id":3346,"web_url":"https://patchwork.libcamera.org/comment/3346/","msgid":"<20200107155804.GD4871@pendragon.ideasonboard.com>","date":"2020-01-07T15:58:04","subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Tue, Jan 07, 2020 at 03:44:41PM +0000, Kieran Bingham wrote:\n> The checkstyle script expects hunks to be declared with a start line and\n> line count, however the unified diff format [0] declares that a single\n> line hunk will only have the start line:\n> \n> > If a hunk contains just one line, only its start line number appears.\n> > Otherwise its line numbers look like ‘start,count’. An empty hunk is\n> > considered to start at the line that follows the hunk.\n> \n> [0] https://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html#Detailed-Unified\n> \n> Attempting to parse a single line hunk results in the following error:\n> \n> File \"./utils/checkstyle.py\", line 110, in __init__\n> raise RuntimeError(\"Malformed diff hunk header '%s'\" % line)\n> RuntimeError: Malformed diff hunk header '@@ -1 +1,2 @@\n> \n> The DiffHunk class only makes use of the start line, and does not\n> utilise the line count, thus update the regex to make the unused\n> groups optional, along with its comma separator.\n> \n> Signed-off-by: Kieran Bingham \n> ---\n> utils/checkstyle.py | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n> index 41cd3371e81e..ab3b977358c7 100755\n> --- a/utils/checkstyle.py\n> +++ b/utils/checkstyle.py\n> @@ -102,7 +102,7 @@ class DiffHunkSide(object):\n> \n> \n> class DiffHunk(object):\n> - diff_header_regex = re.compile(r'@@ -([0-9]+),([0-9]+) \\+([0-9]+),([0-9]+) @@')\n> + diff_header_regex = re.compile(r'@@ -([0-9]+)(,[0-9]+)? \\+([0-9]+)(,?[0-9]+)? @@')\n\nHow about\n\n diff_header_regex = re.compile(r'@@ -([0-9]+),?([0-9]+)? \\+([0-9]+),?([0-9]+)? @@')\n\nso that the count will be correctly captured, in case we need it later ?\n\n> def __init__(self, line):\n> match = DiffHunk.diff_header_regex.match(line)","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 05FF560464\n\tfor ;\n\tTue, 7 Jan 2020 16:58:16 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6A0BE52F;\n\tTue, 7 Jan 2020 16:58:15 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578412695;\n\tbh=c8de6tyt5mG/vXvcFLR97ymAa9hUrDUbygqnEfQbXRg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=VFZkiSrd3FpfuACo3GkLxxn8rzE9WfMkVZMoA5v5rmc5fwibz7XYOEd9W/61Oo23l\n\tzWee1ArHrdO598dWR5IUCpil3aSQZONy2fSjCRd39LW83z9CFbBgS4IJeWZotoJ2PY\n\t6Clkf7poNbioes33NUjqrCJ12vOhF5h393QKigFk=","Date":"Tue, 7 Jan 2020 17:58:04 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"LibCamera Devel ","Message-ID":"<20200107155804.GD4871@pendragon.ideasonboard.com>","References":"<20200107154442.17372-1-kieran.bingham@ideasonboard.com>\n\t<20200107154442.17372-3-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200107154442.17372-3-kieran.bingham@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 07 Jan 2020 15:58:16 -0000"}},{"id":3347,"web_url":"https://patchwork.libcamera.org/comment/3347/","msgid":"<20200107160132.GE4871@pendragon.ideasonboard.com>","date":"2020-01-07T16:01:32","subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Tue, Jan 07, 2020 at 05:58:04PM +0200, Laurent Pinchart wrote:\n> On Tue, Jan 07, 2020 at 03:44:41PM +0000, Kieran Bingham wrote:\n> > The checkstyle script expects hunks to be declared with a start line and\n> > line count, however the unified diff format [0] declares that a single\n> > line hunk will only have the start line:\n> > \n> > > If a hunk contains just one line, only its start line number appears.\n> > > Otherwise its line numbers look like ‘start,count’. An empty hunk is\n> > > considered to start at the line that follows the hunk.\n> > \n> > [0] https://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html#Detailed-Unified\n> > \n> > Attempting to parse a single line hunk results in the following error:\n> > \n> > File \"./utils/checkstyle.py\", line 110, in __init__\n> > raise RuntimeError(\"Malformed diff hunk header '%s'\" % line)\n> > RuntimeError: Malformed diff hunk header '@@ -1 +1,2 @@\n> > \n> > The DiffHunk class only makes use of the start line, and does not\n> > utilise the line count, thus update the regex to make the unused\n> > groups optional, along with its comma separator.\n> > \n> > Signed-off-by: Kieran Bingham \n> > ---\n> > utils/checkstyle.py | 2 +-\n> > 1 file changed, 1 insertion(+), 1 deletion(-)\n> > \n> > diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n> > index 41cd3371e81e..ab3b977358c7 100755\n> > --- a/utils/checkstyle.py\n> > +++ b/utils/checkstyle.py\n> > @@ -102,7 +102,7 @@ class DiffHunkSide(object):\n> > \n> > \n> > class DiffHunk(object):\n> > - diff_header_regex = re.compile(r'@@ -([0-9]+),([0-9]+) \\+([0-9]+),([0-9]+) @@')\n> > + diff_header_regex = re.compile(r'@@ -([0-9]+)(,[0-9]+)? \\+([0-9]+)(,?[0-9]+)? @@')\n> \n> How about\n> \n> diff_header_regex = re.compile(r'@@ -([0-9]+),?([0-9]+)? \\+([0-9]+),?([0-9]+)? @@')\n> \n> so that the count will be correctly captured, in case we need it later ?\n\nWith this fixed,\n\nReviewed-by: Laurent Pinchart \n\n> > def __init__(self, line):\n> > match = DiffHunk.diff_header_regex.match(line)","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 108AA60464\n\tfor ;\n\tTue, 7 Jan 2020 17:01:45 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 482F552F;\n\tTue, 7 Jan 2020 17:01:44 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578412904;\n\tbh=kh6WS4uE6WSQlpM2Qc5Gx5rfYm9UUFgVm0ryy/4jii8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=WCtyfDBACNYsB28nZXDSkTXaSjwzzcHJIh8ESbB3upac2VgnsTvvnar3veTdTt8Mh\n\tHpU48bTt0i2fTCTDDhTWWb/k96uYqe6wJXyad9UBCcP4ekG2fBFapReHXg9ogdgyO9\n\tFFyYgQjHyjySRTFziJ7uAo3cWRd9zU9zScTHUQNY=","Date":"Tue, 7 Jan 2020 18:01:32 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"LibCamera Devel ","Message-ID":"<20200107160132.GE4871@pendragon.ideasonboard.com>","References":"<20200107154442.17372-1-kieran.bingham@ideasonboard.com>\n\t<20200107154442.17372-3-kieran.bingham@ideasonboard.com>\n\t<20200107155804.GD4871@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200107155804.GD4871@pendragon.ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 07 Jan 2020 16:01:45 -0000"}},{"id":3349,"web_url":"https://patchwork.libcamera.org/comment/3349/","msgid":"","date":"2020-01-07T16:04:00","subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 07/01/2020 15:58, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> On Tue, Jan 07, 2020 at 03:44:41PM +0000, Kieran Bingham wrote:\n>> The checkstyle script expects hunks to be declared with a start line and\n>> line count, however the unified diff format [0] declares that a single\n>> line hunk will only have the start line:\n>>\n>>> If a hunk contains just one line, only its start line number appears.\n>>> Otherwise its line numbers look like ‘start,count’. An empty hunk is\n>>> considered to start at the line that follows the hunk.\n>>\n>> [0] https://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html#Detailed-Unified\n>>\n>> Attempting to parse a single line hunk results in the following error:\n>>\n>> File \"./utils/checkstyle.py\", line 110, in __init__\n>> raise RuntimeError(\"Malformed diff hunk header '%s'\" % line)\n>> RuntimeError: Malformed diff hunk header '@@ -1 +1,2 @@\n>>\n>> The DiffHunk class only makes use of the start line, and does not\n>> utilise the line count, thus update the regex to make the unused\n>> groups optional, along with its comma separator.\n>>\n>> Signed-off-by: Kieran Bingham \n>> ---\n>> utils/checkstyle.py | 2 +-\n>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>>\n>> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n>> index 41cd3371e81e..ab3b977358c7 100755\n>> --- a/utils/checkstyle.py\n>> +++ b/utils/checkstyle.py\n>> @@ -102,7 +102,7 @@ class DiffHunkSide(object):\n>> \n>> \n>> class DiffHunk(object):\n>> - diff_header_regex = re.compile(r'@@ -([0-9]+),([0-9]+) \\+([0-9]+),([0-9]+) @@')\n>> + diff_header_regex = re.compile(r'@@ -([0-9]+)(,[0-9]+)? \\+([0-9]+)(,?[0-9]+)? @@')\n> \n> How about\n> \n> diff_header_regex = re.compile(r'@@ -([0-9]+),?([0-9]+)? \\+([0-9]+),?([0-9]+)? @@')\n> \n> so that the count will be correctly captured, in case we need it later ?\n\nThat could be better, but it doesn't make the ',' invalid in the case of\n @@ -1, +1,12 @@\n\nThat likely shouldn't happen, and perhaps isn't an issue. Are you happy\nfor the ',' to be allowed when no digits follow?\n\nI don't think I can come up with either a reason for how this string\nmight end up occurring, or how it would be a problem if we parsed it as\nsuch.. (until we make use of the hunk length at least).\n\nIf you're happy, I'll update the string (and commit message) and push.\n--\nKieran\n\n\n> \n>> def __init__(self, line):\n>> match = DiffHunk.diff_header_regex.match(line)\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E03C360464\n\tfor ;\n\tTue, 7 Jan 2020 17:04:03 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 679BF52F;\n\tTue, 7 Jan 2020 17:04:03 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578413043;\n\tbh=4Xygm6kFS3zumpYgDAaW37D9/Dxpd/AfqzTvSl2z1CY=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=VbEFeqGmTAfd4twIYmQobWwINA1i3DJN+wmYU1IU6ipTD/5PI/7xLcaiEFMrvyO3y\n\t4CZiZyVGMyBzEj4/FGwdLfii1IMUEkdtvKgrvP/pQiVQ2IC9tQH0Xii0OaFZHLcjT0\n\t9vklVfxzxxpkeXHJBye3YeGIaRjHG8c/389UfJl4=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ","Cc":"LibCamera Devel ","References":"<20200107154442.17372-1-kieran.bingham@ideasonboard.com>\n\t<20200107154442.17372-3-kieran.bingham@ideasonboard.com>\n\t<20200107155804.GD4871@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Tue, 7 Jan 2020 16:04:00 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.0","MIME-Version":"1.0","In-Reply-To":"<20200107155804.GD4871@pendragon.ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 07 Jan 2020 16:04:04 -0000"}},{"id":3351,"web_url":"https://patchwork.libcamera.org/comment/3351/","msgid":"<20200107160756.GH4871@pendragon.ideasonboard.com>","date":"2020-01-07T16:07:56","subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Tue, Jan 07, 2020 at 04:04:00PM +0000, Kieran Bingham wrote:\n> On 07/01/2020 15:58, Laurent Pinchart wrote:\n> > On Tue, Jan 07, 2020 at 03:44:41PM +0000, Kieran Bingham wrote:\n> >> The checkstyle script expects hunks to be declared with a start line and\n> >> line count, however the unified diff format [0] declares that a single\n> >> line hunk will only have the start line:\n> >>\n> >>> If a hunk contains just one line, only its start line number appears.\n> >>> Otherwise its line numbers look like ‘start,count’. An empty hunk is\n> >>> considered to start at the line that follows the hunk.\n> >>\n> >> [0] https://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html#Detailed-Unified\n> >>\n> >> Attempting to parse a single line hunk results in the following error:\n> >>\n> >> File \"./utils/checkstyle.py\", line 110, in __init__\n> >> raise RuntimeError(\"Malformed diff hunk header '%s'\" % line)\n> >> RuntimeError: Malformed diff hunk header '@@ -1 +1,2 @@\n> >>\n> >> The DiffHunk class only makes use of the start line, and does not\n> >> utilise the line count, thus update the regex to make the unused\n> >> groups optional, along with its comma separator.\n> >>\n> >> Signed-off-by: Kieran Bingham \n> >> ---\n> >> utils/checkstyle.py | 2 +-\n> >> 1 file changed, 1 insertion(+), 1 deletion(-)\n> >>\n> >> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n> >> index 41cd3371e81e..ab3b977358c7 100755\n> >> --- a/utils/checkstyle.py\n> >> +++ b/utils/checkstyle.py\n> >> @@ -102,7 +102,7 @@ class DiffHunkSide(object):\n> >> \n> >> \n> >> class DiffHunk(object):\n> >> - diff_header_regex = re.compile(r'@@ -([0-9]+),([0-9]+) \\+([0-9]+),([0-9]+) @@')\n> >> + diff_header_regex = re.compile(r'@@ -([0-9]+)(,[0-9]+)? \\+([0-9]+)(,?[0-9]+)? @@')\n> > \n> > How about\n> > \n> > diff_header_regex = re.compile(r'@@ -([0-9]+),?([0-9]+)? \\+([0-9]+),?([0-9]+)? @@')\n> > \n> > so that the count will be correctly captured, in case we need it later ?\n> \n> That could be better, but it doesn't make the ',' invalid in the case of\n> @@ -1, +1,12 @@\n> \n> That likely shouldn't happen, and perhaps isn't an issue. Are you happy\n> for the ',' to be allowed when no digits follow?\n> \n> I don't think I can come up with either a reason for how this string\n> might end up occurring, or how it would be a problem if we parsed it as\n> such.. (until we make use of the hunk length at least).\n> \n> If you're happy, I'll update the string (and commit message) and push.\n\nIt's a good point. I'm happy either way, but if we include the ',' in\nthe group, does the last group need to have a '?' after the ',' ? i.e.\nshouldn't it be\n\n diff_header_regex = re.compile(r'@@ -([0-9]+)(,[0-9]+)? \\+([0-9]+)(,[0-9]+)? @@')\n\n> >> def __init__(self, line):\n> >> match = DiffHunk.diff_header_regex.match(line)","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3BBF860464\n\tfor ;\n\tTue, 7 Jan 2020 17:08:09 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4A1ED52F;\n\tTue, 7 Jan 2020 17:08:08 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578413288;\n\tbh=x6wrQzgc7c+2JELwNlsf7662+IVSc1x/bxAQGTLau+g=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=NBA+J/UVcVo+Acdv3RUNyM5gYuQQ+y6PFIRJdUz3NqfgOwwD5mLZTBbNDa2bE3o7v\n\tIfIJbDgrFHi+2y127ZcxGGHoXausLBnbGN+AUhN5Qws0xj3ro8IJ2czF3E1AFWfnl5\n\tfZQEmBQw+cmrzAnjN4Fx//54eDZre0icFogGta28=","Date":"Tue, 7 Jan 2020 18:07:56 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"LibCamera Devel ","Message-ID":"<20200107160756.GH4871@pendragon.ideasonboard.com>","References":"<20200107154442.17372-1-kieran.bingham@ideasonboard.com>\n\t<20200107154442.17372-3-kieran.bingham@ideasonboard.com>\n\t<20200107155804.GD4871@pendragon.ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 07 Jan 2020 16:08:09 -0000"}},{"id":3352,"web_url":"https://patchwork.libcamera.org/comment/3352/","msgid":"<2e946241-ca7f-31fe-6df6-f392c7fb4791@ideasonboard.com>","date":"2020-01-07T16:28:01","subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 07/01/2020 16:07, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> On Tue, Jan 07, 2020 at 04:04:00PM +0000, Kieran Bingham wrote:\n>> On 07/01/2020 15:58, Laurent Pinchart wrote:\n>>> On Tue, Jan 07, 2020 at 03:44:41PM +0000, Kieran Bingham wrote:\n>>>> The checkstyle script expects hunks to be declared with a start line and\n>>>> line count, however the unified diff format [0] declares that a single\n>>>> line hunk will only have the start line:\n>>>>\n>>>>> If a hunk contains just one line, only its start line number appears.\n>>>>> Otherwise its line numbers look like ‘start,count’. An empty hunk is\n>>>>> considered to start at the line that follows the hunk.\n>>>>\n>>>> [0] https://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html#Detailed-Unified\n>>>>\n>>>> Attempting to parse a single line hunk results in the following error:\n>>>>\n>>>> File \"./utils/checkstyle.py\", line 110, in __init__\n>>>> raise RuntimeError(\"Malformed diff hunk header '%s'\" % line)\n>>>> RuntimeError: Malformed diff hunk header '@@ -1 +1,2 @@\n>>>>\n>>>> The DiffHunk class only makes use of the start line, and does not\n>>>> utilise the line count, thus update the regex to make the unused\n>>>> groups optional, along with its comma separator.\n>>>>\n>>>> Signed-off-by: Kieran Bingham \n>>>> ---\n>>>> utils/checkstyle.py | 2 +-\n>>>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>>>>\n>>>> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n>>>> index 41cd3371e81e..ab3b977358c7 100755\n>>>> --- a/utils/checkstyle.py\n>>>> +++ b/utils/checkstyle.py\n>>>> @@ -102,7 +102,7 @@ class DiffHunkSide(object):\n>>>> \n>>>> \n>>>> class DiffHunk(object):\n>>>> - diff_header_regex = re.compile(r'@@ -([0-9]+),([0-9]+) \\+([0-9]+),([0-9]+) @@')\n>>>> + diff_header_regex = re.compile(r'@@ -([0-9]+)(,[0-9]+)? \\+([0-9]+)(,?[0-9]+)? @@')\n>>>\n>>> How about\n>>>\n>>> diff_header_regex = re.compile(r'@@ -([0-9]+),?([0-9]+)? \\+([0-9]+),?([0-9]+)? @@')\n>>>\n>>> so that the count will be correctly captured, in case we need it later ?\n>>\n>> That could be better, but it doesn't make the ',' invalid in the case of\n>> @@ -1, +1,12 @@\n>>\n>> That likely shouldn't happen, and perhaps isn't an issue. Are you happy\n>> for the ',' to be allowed when no digits follow?\n>>\n>> I don't think I can come up with either a reason for how this string\n>> might end up occurring, or how it would be a problem if we parsed it as\n>> such.. (until we make use of the hunk length at least).\n>>\n>> If you're happy, I'll update the string (and commit message) and push.\n> \n> It's a good point. I'm happy either way, but if we include the ',' in\n> the group, does the last group need to have a '?' after the ',' ? i.e.\n> shouldn't it be\n>\n> diff_header_regex = re.compile(r'@@ -([0-9]+)(,[0-9]+)? \\+([0-9]+)(,[0-9]+)? @@')\n> \n\nIndeed - the ? in the last group was extraneous, sorry it was a left\nover from trying out the combinations, or rather an artefact of me\nremoving the first one but not the second :-D\n\nIf you're content that any extraneous ',' provided will do no harm (and\nin my initial testing here, I don't think it will) then I'll go with\nyour variant to facilitate easy extraction of the hunk size later if\nit's needed.\n\n>>>> def __init__(self, line):\n>>>> match = DiffHunk.diff_header_regex.match(line)\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B80E860464\n\tfor ;\n\tTue, 7 Jan 2020 17:28:05 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 11E3652F;\n\tTue, 7 Jan 2020 17:28:04 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578414485;\n\tbh=m8wvdgZaJ5lMmGo50O8vT93sDpmpixXrZItpurbS/xU=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=BLPNP0zqcSkD2yNJxjP7oqnGSCn5hwvw9v9LEHAhg5X9YZzp1PWA1pjtU8okcKKOl\n\tjC58LDFwBoAaqq37aXI2w2kpABsYv3lETPsCnLZAyerr5tg4+m0qAyDcrk0AeHelrN\n\trtK6HEwVDEQ+9xVef2eyd+e6opN3ypxNon8crca4=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ","Cc":"LibCamera Devel ","References":"<20200107154442.17372-1-kieran.bingham@ideasonboard.com>\n\t<20200107154442.17372-3-kieran.bingham@ideasonboard.com>\n\t<20200107155804.GD4871@pendragon.ideasonboard.com>\n\t\n\t<20200107160756.GH4871@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<2e946241-ca7f-31fe-6df6-f392c7fb4791@ideasonboard.com>","Date":"Tue, 7 Jan 2020 16:28:01 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.0","MIME-Version":"1.0","In-Reply-To":"<20200107160756.GH4871@pendragon.ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 2/2] utils: checkstyle.py: Support\n\tsingle line hunks","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 07 Jan 2020 16:28:05 -0000"}}]