[{"id":14631,"web_url":"https://patchwork.libcamera.org/comment/14631/","msgid":"","date":"2021-01-20T10:59:32","subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"content":"On Wed, 20 Jan 2021 at 10:52, Naushir Patuck wrote:\n\n> Hi all,\n>\n> I have started noticing a problem with the utils/checkstyle.py script when\n> run in the provided pre-commit hook (utils/hooks/pre-commit). Here is an\n> example output when I do a \"git commit --amend --fixup=xxxx\" command:\n>\n\nSorry, my git command has a typo above, it is \"git commit -a --fixup=xxxx\"\n\n\n>\n> fatal: ambiguous argument '': unknown revision or path not in the working\n> tree.\n> Use '--' to separate paths from revisions, like this:\n> 'git [...] -- [...]'\n> Traceback (most recent call last):\n> File \"./utils/checkstyle.py\", line 875, in \n> sys.exit(main(sys.argv))\n> File \"./utils/checkstyle.py\", line 850, in main\n> commits.append(StagedChanges())\n> File \"./utils/checkstyle.py\", line 237, in __init__\n> Commit.__init__(self, '')\n> File \"./utils/checkstyle.py\", line 206, in __init__\n> self.__parse()\n> File \"./utils/checkstyle.py\", line 215, in __parse\n> self.__title = files[0]\n> IndexError: list index out of range\n>\n> This used to certainly work in the past, so I can only assume either\n> something in the script, or my environment has changed. The reason behind\n> the git command failure seems to be related to the last argument in the\n> subprocess call:\n>\n> ret = subprocess.run(['git', 'show', '--pretty=oneline', '--name-status',\n> self.commit],\n>\n> stdout=subprocess.PIPE).stdout.decode('utf-8')\n>\n> where self.commit is an empty string.\n>\n> This may have been introduced by commit 097720840 ('utils: checkstyle.py:\n> Move commit handling to a separate section'). A fix that works for me is\n> as follows:\n>\n> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n> index 0e9659e98518..cb7b2d151412 100755\n> --- a/utils/checkstyle.py\n> +++ b/utils/checkstyle.py\n> @@ -207,9 +207,11 @@ class Commit:\n>\n> def __parse(self):\n> # Get the commit title and list of files.\n> - ret = subprocess.run(['git', 'show', '--pretty=oneline',\n> '--name-status',\n> - self.commit],\n> -\n> stdout=subprocess.PIPE).stdout.decode('utf-8')\n> + args = ['git', 'show', '--pretty=oneline', '--name-status']\n> + if self.commit != '':\n> + args.append(self.commit)\n> +\n> + ret = subprocess.run(args,\n> stdout=subprocess.PIPE).stdout.decode('utf-8')\n> files = ret.splitlines()\n> self.__files = [CommitFile(f) for f in files[1:]]\n>\n> I was just wondering if I have something strange in my environment that is\n> causing these issues, or are other folks seeing this as well?\n>\n> Regards,\n> Naush\n>\n>","headers":{"Return-Path":"","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 994BEC0F2A\n\tfor ;\n\tWed, 20 Jan 2021 10:59:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 63E1D681A5;\n\tWed, 20 Jan 2021 11:59:52 +0100 (CET)","from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com\n\t[IPv6:2a00:1450:4864:20::22a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7D11668193\n\tfor ;\n\tWed, 20 Jan 2021 11:59:50 +0100 (CET)","by mail-lj1-x22a.google.com with SMTP id p13so25602681ljg.2\n\tfor ;\n\tWed, 20 Jan 2021 02:59:50 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"ThqIv6Qz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to;\n\tbh=pgeWdOZ1vnei/5c2jedsRQz2ZQU3L/JliOjWuZohgis=;\n\tb=ThqIv6QzIoGM9MMEjUCGUUipNmV6EDH1a39XKzeO93POlzzcXVgXdf9hf/gdj2CTyU\n\tROL3ir0IA9WFB+SiZwChvT3+yDkJDQ10HAkzcDrEsGMwVqZUyXKleoaHP7zueYyujUnE\n\tezdvC06RlBnyWf6ny5cYapPp0rf0a/PGLSnNrRdlXpcira7hyM2WdCROAWk3Xbp5MTQb\n\tCY8gTVbuUcZICPUTx8nz2YETlFO3uoaxQClD53zKWp9UB7WIX0ZrAzdNKm6y1D0s3cGe\n\turHuIhDT6EihTj11DsNRDXPux2VCZ8q27Ub0XcCZ7T4wjultWMzLhsxo7hrZd1+G244v\n\tblbA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to;\n\tbh=pgeWdOZ1vnei/5c2jedsRQz2ZQU3L/JliOjWuZohgis=;\n\tb=HUsZqDqjJ7Bnbi941iBs+HzYmDoyXYO0OmJ6vOTINKEXXMvSl0RehiEKQEN3t7hkAq\n\tR+ZebBTDtpbyrqCzHuITjaGKIyYn3LKDnXeHq6FHuUGG3dSkB8bHBKIVoTF7A9+TXS20\n\tEcfpcCuXenYGJrstwtnMjZRzkETSrWPaZJHdTo6Noxna3u1lhKr9lnbr5TsMNiU9RlBC\n\tWgGE7pe9DhHKv9eOu5JjRqYLVkebaKoQqEcL9MeNnykAuUEsLcXrWV+4F71KdDL01YXg\n\tHebdQiFaEZA3BoySjiqp52lEdeSMR8dy6Z4sUFmLTF7JyR2ZYH3NqAaLFERSQbakNLIj\n\tD1pg==","X-Gm-Message-State":"AOAM533ZKf2VbVS1rmLeQPJzBvJN7kvex7Yy9ZQ7EVyv8X/ADuuTjXRy\n\tEDJMvO8BzL/m6WN55K4XWPoeg1hTPYp9Ds6qxYNlLHjdUFLqRA==","X-Google-Smtp-Source":"ABdhPJwIWXDbJhkLFvKp0CDtsnlzmhAn9gH983YmhPEYjzzbxeHWoCafQpUQ0BBXnVcoqFw7VFSHzdlOl1q2ocIQVp0=","X-Received":"by 2002:a2e:810c:: with SMTP id\n\td12mr3940813ljg.400.1611140388317; \n\tWed, 20 Jan 2021 02:59:48 -0800 (PST)","MIME-Version":"1.0","References":"","In-Reply-To":"","From":"Naushir Patuck ","Date":"Wed, 20 Jan 2021 10:59:32 +0000","Message-ID":"","To":"libcamera devel ","Subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","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","Content-Type":"multipart/mixed;\n\tboundary=\"===============2791036539158758080==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14640,"web_url":"https://patchwork.libcamera.org/comment/14640/","msgid":"<8417ad8a-0f8d-4b07-90b4-5ad37c0d7215@uajain.com>","date":"2021-01-20T16:51:51","subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","submitter":{"id":1,"url":"https://patchwork.libcamera.org/api/people/1/","name":"Umang Jain","email":"email@uajain.com"},"content":"Hi Naushir\n\nYes, I have hit this issue with pre-commit and your diagonsis is right.\n\nOn 1/20/21 4:29 PM, Naushir Patuck wrote:\n>\n>\n> On Wed, 20 Jan 2021 at 10:52, Naushir Patuck > wrote:\n>\n> Hi all,\n>\n> I have started noticing a problem with the utils/checkstyle.py\n> script when run in the provided pre-commit hook\n> (utils/hooks/pre-commit).  Here is an example output when I do a\n> \"git commit --amend --fixup=xxxx\" command:\n>\n>\n> Sorry, my git command has a typo above, it is \"git commit -a --fixup=xxxx\"\n>\n>\n> fatal: ambiguous argument '': unknown revision or path not in the\n> working tree.\n> Use '--' to separate paths from revisions, like this:\n> 'git [...] -- [...]'\n> Traceback (most recent call last):\n>   File \"./utils/checkstyle.py\", line 875, in \n>     sys.exit(main(sys.argv))\n>   File \"./utils/checkstyle.py\", line 850, in main\n>     commits.append(StagedChanges())\n>   File \"./utils/checkstyle.py\", line 237, in __init__\n>     Commit.__init__(self, '')\n>   File \"./utils/checkstyle.py\", line 206, in __init__\n>     self.__parse()\n>   File \"./utils/checkstyle.py\", line 215, in __parse\n>     self.__title = files[0]\n> IndexError: list index out of range\n>\n> This used to certainly work in the past, so I can only assume\n> either something in the script, or my environment has changed. \n> The reason behind the git command failure seems to be related to\n> the last argument in the subprocess call:\n>\n> ret = subprocess.run(['git', 'show', '--pretty=oneline',\n> '--name-status',\n>                                   self.commit],\n> stdout=subprocess.PIPE).stdout.decode('utf-8')\n>\n> where self.commit is an empty string.\n>\n> This may have been introduced by commit 097720840 ('utils:\n> checkstyle.py: Move commit handling to a separate section').  A\n> fix that works for me is as follows:\n>\n> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n> index 0e9659e98518..cb7b2d151412 100755\n> --- a/utils/checkstyle.py\n> +++ b/utils/checkstyle.py\n> @@ -207,9 +207,11 @@ class Commit:\n>\n>      def __parse(self):\n>          # Get the commit title and list of files.\n> -        ret = subprocess.run(['git', 'show', '--pretty=oneline',\n> '--name-status',\n> -                              self.commit],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> +        args = ['git', 'show', '--pretty=oneline', '--name-status']\n> +        if self.commit != '':\n> +            args.append(self.commit)\n> +\n> +        ret = subprocess.run(args,\n> stdout=subprocess.PIPE).stdout.decode('utf-8')\n>          files = ret.splitlines()\n>          self.__files = [CommitFile(f) for f in files[1:]]\n>\nI think this will parse the HEAD commit and not the diff/staged changes. \nI haven't looked at it closely but that's my understanding. I have seen \nmostly using the hook as a post-commit by other devs and that (in my \ntesting) works fine.\n>\n> I was just wondering if I have something strange in my environment\n> that is causing these issues, or are other folks seeing this as well?\n>\n> Regards,\n> Naush\n>\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","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 1B1A0BD808\n\tfor ;\n\tWed, 20 Jan 2021 16:52:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 88FDC681B3;\n\tWed, 20 Jan 2021 17:52:11 +0100 (CET)","from mail.uajain.com (static.126.159.217.95.clients.your-server.de\n\t[95.217.159.126])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C0C7168180\n\tfor ;\n\tWed, 20 Jan 2021 17:52:09 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=uajain.com header.i=@uajain.com\n\theader.b=\"r+diEb5u\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=uajain.com; s=mail;\n\tt=1611161529; bh=wu3YnZKHMFzgN+2iYdnlUSDC5x1AFEX0PwGNYxtkS0k=;\n\th=Subject:To:References:From:In-Reply-To;\n\tb=r+diEb5ujIJm43/d5fZOuUWLBH7bE0mg+4dUyxcXfF1GJqYi80jEAPyJf4himxcOw\n\t12vOC9bomeltY5cdsOgZfI6hxFaBb4GmsoycEs0yZb6Pnzo2aa19FM3ACatnVt1kHX\n\t2RxwlDufCwp9VLM2pAKRwIfP1ZSnXeWeylsjz74FquPdilYxtmSLEhSwhg60g/+rbq\n\t1fiEy65k0/sD61rMjUHJkNCxwu0N7Rr8fMBdUQHERMnKVvSGJDKJ2fxwTUzRCvSo/J\n\tG78Ns+6Prwn0mXPb1diFQ8stOUu37dN5mWw0Rtua3MPKNX631X9gqRapcQIlNPtyW3\n\tqVyOGga5sq/3Q==","To":"Naushir Patuck ,\n\tlibcamera devel ","References":"\n\t","From":"Umang Jain ","Message-ID":"<8417ad8a-0f8d-4b07-90b4-5ad37c0d7215@uajain.com>","Date":"Wed, 20 Jan 2021 22:21:51 +0530","Mime-Version":"1.0","In-Reply-To":"","Content-Language":"en-US","Subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","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","Content-Type":"multipart/mixed;\n\tboundary=\"===============4464589551058170118==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14642,"web_url":"https://patchwork.libcamera.org/comment/14642/","msgid":"","date":"2021-01-21T09:06:18","subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"content":"Hi Umang,\n\n\nOn Wed, 20 Jan 2021 at 16:52, Umang Jain wrote:\n\n> Hi Naushir\n>\n> Yes, I have hit this issue with pre-commit and your diagonsis is right.\n>\n\nThanks for confirming! I'm glad it's not only me :-) I'm positive this has\nonly recently started happening.\n\n\n>\n> On 1/20/21 4:29 PM, Naushir Patuck wrote:\n>\n>\n>\n> On Wed, 20 Jan 2021 at 10:52, Naushir Patuck \n> wrote:\n>\n>> Hi all,\n>>\n>> I have started noticing a problem with the utils/checkstyle.py script\n>> when run in the provided pre-commit hook (utils/hooks/pre-commit). Here is\n>> an example output when I do a \"git commit --amend --fixup=xxxx\" command:\n>>\n>\n> Sorry, my git command has a typo above, it is \"git commit -a --fixup=xxxx\"\n>\n>\n>>\n>> fatal: ambiguous argument '': unknown revision or path not in the working\n>> tree.\n>> Use '--' to separate paths from revisions, like this:\n>> 'git [...] -- [...]'\n>> Traceback (most recent call last):\n>> File \"./utils/checkstyle.py\", line 875, in \n>> sys.exit(main(sys.argv))\n>> File \"./utils/checkstyle.py\", line 850, in main\n>> commits.append(StagedChanges())\n>> File \"./utils/checkstyle.py\", line 237, in __init__\n>> Commit.__init__(self, '')\n>> File \"./utils/checkstyle.py\", line 206, in __init__\n>> self.__parse()\n>> File \"./utils/checkstyle.py\", line 215, in __parse\n>> self.__title = files[0]\n>> IndexError: list index out of range\n>>\n>> This used to certainly work in the past, so I can only assume either\n>> something in the script, or my environment has changed. The reason behind\n>> the git command failure seems to be related to the last argument in the\n>> subprocess call:\n>>\n>> ret = subprocess.run(['git', 'show', '--pretty=oneline', '--name-status',\n>> self.commit],\n>>\n>> stdout=subprocess.PIPE).stdout.decode('utf-8')\n>>\n>> where self.commit is an empty string.\n>>\n>> This may have been introduced by commit 097720840 ('utils: checkstyle.py:\n>> Move commit handling to a separate section'). A fix that works for me is\n>> as follows:\n>>\n>> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n>> index 0e9659e98518..cb7b2d151412 100755\n>> --- a/utils/checkstyle.py\n>> +++ b/utils/checkstyle.py\n>> @@ -207,9 +207,11 @@ class Commit:\n>>\n>> def __parse(self):\n>> # Get the commit title and list of files.\n>> - ret = subprocess.run(['git', 'show', '--pretty=oneline',\n>> '--name-status',\n>> - self.commit],\n>> -\n>> stdout=subprocess.PIPE).stdout.decode('utf-8')\n>> + args = ['git', 'show', '--pretty=oneline', '--name-status']\n>> + if self.commit != '':\n>> + args.append(self.commit)\n>> +\n>> + ret = subprocess.run(args,\n>> stdout=subprocess.PIPE).stdout.decode('utf-8')\n>> files = ret.splitlines()\n>> self.__files = [CommitFile(f) for f in files[1:]]\n>>\n>> I think this will parse the HEAD commit and not the diff/staged changes.\n> I haven't looked at it closely but that's my understanding. I have seen\n> mostly using the hook as a post-commit by other devs and that (in my\n> testing) works fine.\n>\n\nPerhaps - my fix above worked on the (seemingly correct) assumption that an\nempty string appended to the end of the argument list would break the\ncommand. If there is a commit hash in the self.commit string, it will\nappend it as before.\nIf the checkpatch script is not meant to be used as a pre-commit hook,\nperhaps we should remove the utils/hooks/pre-commit script entirely so\nothers don't encounter this problem?\n\nRegards,\nNaush\n\n\n\n> I was just wondering if I have something strange in my environment that is\n>> causing these issues, or are other folks seeing this as well?\n>>\n>> Regards,\n>> Naush\n>>\n>>\n> _______________________________________________\n> libcamera-devel mailing listlibcamera-devel@lists.libcamera.orghttps://lists.libcamera.org/listinfo/libcamera-devel\n>\n>\n>","headers":{"Return-Path":"","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 31C8DBD808\n\tfor ;\n\tThu, 21 Jan 2021 09:06:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 87C77681B0;\n\tThu, 21 Jan 2021 10:06:36 +0100 (CET)","from mail-lj1-x230.google.com (mail-lj1-x230.google.com\n\t[IPv6:2a00:1450:4864:20::230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3FA0A60311\n\tfor ;\n\tThu, 21 Jan 2021 10:06:35 +0100 (CET)","by mail-lj1-x230.google.com with SMTP id j3so1610897ljb.9\n\tfor ;\n\tThu, 21 Jan 2021 01:06:35 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"m7ZlMx9w\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=qNmNrzADA6r2Or9KJNN7IksSQ31D5iC5DFVvRlQIDrw=;\n\tb=m7ZlMx9wkFuyniNbCZItUM0Nsir8V7/8aUlL6yWa3qzqcX7526sWGB7CTi8LjYXyb+\n\tC3kpZIhEHgprqKiPo0ddF56CMDFKaD7VG5Pr0YPk735nwsPUQv2TJZsNzrALnbt1eTQH\n\tIeJXeiJkAXlu4aRNUA8jjWqLozsG7DvimLRgg+wdeFFF5WQdb3t3v0jpIihYQ2BIKAmF\n\tuIpAB+FC8UdDQxumMbe6lInlhnVAX4DAtDN+n47IRKZHg3gniiYkCWeIRTHNS4/v3V/x\n\txpG/8IDuuzyT6UorK2ttRFIBotvUxN3I8oSBELppIdQ0JC0/cBe4dwape898N81ekl1p\n\tcoTQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=qNmNrzADA6r2Or9KJNN7IksSQ31D5iC5DFVvRlQIDrw=;\n\tb=LinnN3kd9OUwXh5jC9lFJuROEkWqY9Uakt9bW8t3S+Xww2qAKoBtwB2iQxrnHbvMEA\n\tfNoJha0LwbThypQN1wDrnRMhGTfE/jLh1JsmMatpb8RpNPfhZpIEbWupotSiAZLRiEd1\n\tSAct5wsnEEmf7JUMHGH5zMVIFGrm1w/IX+0zysxupe5HCoW5nx4cSUJSo21GfyAf/N8R\n\tePGxwdr9yw2o8P4l/Q5vSUdgjHhPEAu+YW7Tq8MnegElCoUrdKl2B9X1fYnSGeSKJ08M\n\tY75FlJZ62bdHHfkflfu2g39bSCE5o+EBvxvQ9Th7ERnRzXZ6k8cw+S5KCaNFHmeBOkem\n\tbG4Q==","X-Gm-Message-State":"AOAM530YuanenNsKY6q+3YUp2BI72zrI3iHuhp/tBG64oNKouYIHUEyL\n\tEg5SGWM2mJFVG13trq+DlejvPz/aMQAUsVWWp05OLck8GDSNGw==","X-Google-Smtp-Source":"ABdhPJwYjff+WIj5WPPyS0FLbIkWE+pJ+yQkfg8s5CCdhNCwR0KnZUNMPlZHccPzLxslvtukLPnFyZjRudyiRZHPcGo=","X-Received":"by 2002:a2e:810c:: with SMTP id\n\td12mr6171303ljg.400.1611219994546; \n\tThu, 21 Jan 2021 01:06:34 -0800 (PST)","MIME-Version":"1.0","References":"\n\t\n\t<8417ad8a-0f8d-4b07-90b4-5ad37c0d7215@uajain.com>","In-Reply-To":"<8417ad8a-0f8d-4b07-90b4-5ad37c0d7215@uajain.com>","From":"Naushir Patuck ","Date":"Thu, 21 Jan 2021 09:06:18 +0000","Message-ID":"","To":"Umang Jain ","Subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","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","Cc":"libcamera devel ","Content-Type":"multipart/mixed;\n\tboundary=\"===============6552031668378434830==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14648,"web_url":"https://patchwork.libcamera.org/comment/14648/","msgid":"","date":"2021-01-21T12:46:27","subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Naush,\n\nOn Thu, Jan 21, 2021 at 09:06:18AM +0000, Naushir Patuck wrote:\n> Hi Umang,\n> \n> On Wed, 20 Jan 2021 at 16:52, Umang Jain wrote:\n> \n> > Hi Naushir\n> >\n> > Yes, I have hit this issue with pre-commit and your diagonsis is right.\n> \n> Thanks for confirming! I'm glad it's not only me :-) I'm positive this has\n> only recently started happening.\n> \n> > On 1/20/21 4:29 PM, Naushir Patuck wrote:\n> > On Wed, 20 Jan 2021 at 10:52, Naushir Patuck wrote:\n> >\n> >> Hi all,\n> >>\n> >> I have started noticing a problem with the utils/checkstyle.py script\n> >> when run in the provided pre-commit hook (utils/hooks/pre-commit). Here is\n> >> an example output when I do a \"git commit --amend --fixup=xxxx\" command:\n> >\n> > Sorry, my git command has a typo above, it is \"git commit -a --fixup=xxxx\"\n> >\n> >> fatal: ambiguous argument '': unknown revision or path not in the working\n> >> tree.\n> >> Use '--' to separate paths from revisions, like this:\n> >> 'git [...] -- [...]'\n> >> Traceback (most recent call last):\n> >> File \"./utils/checkstyle.py\", line 875, in \n> >> sys.exit(main(sys.argv))\n> >> File \"./utils/checkstyle.py\", line 850, in main\n> >> commits.append(StagedChanges())\n> >> File \"./utils/checkstyle.py\", line 237, in __init__\n> >> Commit.__init__(self, '')\n> >> File \"./utils/checkstyle.py\", line 206, in __init__\n> >> self.__parse()\n> >> File \"./utils/checkstyle.py\", line 215, in __parse\n> >> self.__title = files[0]\n> >> IndexError: list index out of range\n> >>\n> >> This used to certainly work in the past, so I can only assume either\n> >> something in the script, or my environment has changed. The reason behind\n> >> the git command failure seems to be related to the last argument in the\n> >> subprocess call:\n> >>\n> >> ret = subprocess.run(['git', 'show', '--pretty=oneline', '--name-status',\n> >> self.commit],\n> >>\n> >> stdout=subprocess.PIPE).stdout.decode('utf-8')\n> >>\n> >> where self.commit is an empty string.\n> >>\n> >> This may have been introduced by commit 097720840 ('utils: checkstyle.py:\n> >> Move commit handling to a separate section'). A fix that works for me is\n> >> as follows:\n\nI think the issue has been introduced in commit 4f5d17f3a4f5 (\"utils:\ncheckstyle.py: Make title and files properties of commit class\"). I have\nsent a tentative fix to the mailing list and CC'ed you. Could you please\ntest it ?\n\n> >> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n> >> index 0e9659e98518..cb7b2d151412 100755\n> >> --- a/utils/checkstyle.py\n> >> +++ b/utils/checkstyle.py\n> >> @@ -207,9 +207,11 @@ class Commit:\n> >>\n> >> def __parse(self):\n> >> # Get the commit title and list of files.\n> >> - ret = subprocess.run(['git', 'show', '--pretty=oneline',\n> >> '--name-status',\n> >> - self.commit],\n> >> -\n> >> stdout=subprocess.PIPE).stdout.decode('utf-8')\n> >> + args = ['git', 'show', '--pretty=oneline', '--name-status']\n> >> + if self.commit != '':\n> >> + args.append(self.commit)\n> >> +\n> >> + ret = subprocess.run(args,\n> >> stdout=subprocess.PIPE).stdout.decode('utf-8')\n> >> files = ret.splitlines()\n> >> self.__files = [CommitFile(f) for f in files[1:]]\n> >>\n> >> I think this will parse the HEAD commit and not the diff/staged changes.\n> >\n> > I haven't looked at it closely but that's my understanding. I have seen\n> > mostly using the hook as a post-commit by other devs and that (in my\n> > testing) works fine.\n> \n> Perhaps - my fix above worked on the (seemingly correct) assumption that an\n> empty string appended to the end of the argument list would break the\n> command. If there is a commit hash in the self.commit string, it will\n> append it as before.\n> If the checkpatch script is not meant to be used as a pre-commit hook,\n> perhaps we should remove the utils/hooks/pre-commit script entirely so\n> others don't encounter this problem?\n> \n> >> I was just wondering if I have something strange in my environment that is\n> >> causing these issues, or are other folks seeing this as well?","headers":{"Return-Path":"","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 E55B9BD808\n\tfor ;\n\tThu, 21 Jan 2021 12:46:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B2564681F3;\n\tThu, 21 Jan 2021 13:46:47 +0100 (CET)","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 90B1F681EC\n\tfor ;\n\tThu, 21 Jan 2021 13:46:45 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2336E50E;\n\tThu, 21 Jan 2021 13:46:45 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"bz63qJ8Q\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611233205;\n\tbh=r5optwKuq0qeiTKyD9G5jbDp5XGXYbgZqAjgU9gzyz4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=bz63qJ8QyzhCpaEz5UT+1dKMy8blz+/J5mFPY5Ya1qgRrFvkolyu+/CjqjCIQBi0G\n\tmnEsWCN8bF4luvZUrZKPqW4smo00EqmIGs67uGvJ7Lybm1ucc4ZZs/tsaqgV67hnZH\n\tQ+RRBvMEb1O5XUCeIggfsFoif3thqvtnbTIsHj/c=","Date":"Thu, 21 Jan 2021 14:46:27 +0200","From":"Laurent Pinchart ","To":"Naushir Patuck ","Message-ID":"","References":"\n\t\n\t<8417ad8a-0f8d-4b07-90b4-5ad37c0d7215@uajain.com>\n\t","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","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","Cc":"libcamera devel ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14651,"web_url":"https://patchwork.libcamera.org/comment/14651/","msgid":"","date":"2021-01-21T12:59:24","subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"content":"Hi Laurent,\n\n\n\nOn Thu, 21 Jan 2021, 12:46 pm Laurent Pinchart, <\nlaurent.pinchart@ideasonboard.com> wrote:\n\n> Hi Naush,\n>\n> On Thu, Jan 21, 2021 at 09:06:18AM +0000, Naushir Patuck wrote:\n> > Hi Umang,\n> >\n> > On Wed, 20 Jan 2021 at 16:52, Umang Jain wrote:\n> >\n> > > Hi Naushir\n> > >\n> > > Yes, I have hit this issue with pre-commit and your diagonsis is right.\n> >\n> > Thanks for confirming! I'm glad it's not only me :-) I'm positive this\n> has\n> > only recently started happening.\n> >\n> > > On 1/20/21 4:29 PM, Naushir Patuck wrote:\n> > > On Wed, 20 Jan 2021 at 10:52, Naushir Patuck wrote:\n> > >\n> > >> Hi all,\n> > >>\n> > >> I have started noticing a problem with the utils/checkstyle.py script\n> > >> when run in the provided pre-commit hook (utils/hooks/pre-commit).\n> Here is\n> > >> an example output when I do a \"git commit --amend --fixup=xxxx\"\n> command:\n> > >\n> > > Sorry, my git command has a typo above, it is \"git commit -a\n> --fixup=xxxx\"\n> > >\n> > >> fatal: ambiguous argument '': unknown revision or path not in the\n> working\n> > >> tree.\n> > >> Use '--' to separate paths from revisions, like this:\n> > >> 'git [...] -- [...]'\n> > >> Traceback (most recent call last):\n> > >> File \"./utils/checkstyle.py\", line 875, in \n> > >> sys.exit(main(sys.argv))\n> > >> File \"./utils/checkstyle.py\", line 850, in main\n> > >> commits.append(StagedChanges())\n> > >> File \"./utils/checkstyle.py\", line 237, in __init__\n> > >> Commit.__init__(self, '')\n> > >> File \"./utils/checkstyle.py\", line 206, in __init__\n> > >> self.__parse()\n> > >> File \"./utils/checkstyle.py\", line 215, in __parse\n> > >> self.__title = files[0]\n> > >> IndexError: list index out of range\n> > >>\n> > >> This used to certainly work in the past, so I can only assume either\n> > >> something in the script, or my environment has changed. The reason\n> behind\n> > >> the git command failure seems to be related to the last argument in\n> the\n> > >> subprocess call:\n> > >>\n> > >> ret = subprocess.run(['git', 'show', '--pretty=oneline',\n> '--name-status',\n> > >> self.commit],\n> > >>\n> > >> stdout=subprocess.PIPE).stdout.decode('utf-8')\n> > >>\n> > >> where self.commit is an empty string.\n> > >>\n> > >> This may have been introduced by commit 097720840 ('utils:\n> checkstyle.py:\n> > >> Move commit handling to a separate section'). A fix that works for\n> me is\n> > >> as follows:\n>\n> I think the issue has been introduced in commit 4f5d17f3a4f5 (\"utils:\n> checkstyle.py: Make title and files properties of commit class\"). I have\n> sent a tentative fix to the mailing list and CC'ed you. Could you please\n> test it ?\n>\n\nThanks for the fix. Will test later and report back.\n\nRegards,\nNaush\n\n>\n> > >> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n> > >> index 0e9659e98518..cb7b2d151412 100755\n> > >> --- a/utils/checkstyle.py\n> > >> +++ b/utils/checkstyle.py\n> > >> @@ -207,9 +207,11 @@ class Commit:\n> > >>\n> > >> def __parse(self):\n> > >> # Get the commit title and list of files.\n> > >> - ret = subprocess.run(['git', 'show', '--pretty=oneline',\n> > >> '--name-status',\n> > >> - self.commit],\n> > >> -\n> > >> stdout=subprocess.PIPE).stdout.decode('utf-8')\n> > >> + args = ['git', 'show', '--pretty=oneline', '--name-status']\n> > >> + if self.commit != '':\n> > >> + args.append(self.commit)\n> > >> +\n> > >> + ret = subprocess.run(args,\n> > >> stdout=subprocess.PIPE).stdout.decode('utf-8')\n> > >> files = ret.splitlines()\n> > >> self.__files = [CommitFile(f) for f in files[1:]]\n> > >>\n> > >> I think this will parse the HEAD commit and not the diff/staged\n> changes.\n> > >\n> > > I haven't looked at it closely but that's my understanding. I have seen\n> > > mostly using the hook as a post-commit by other devs and that (in my\n> > > testing) works fine.\n> >\n> > Perhaps - my fix above worked on the (seemingly correct) assumption that\n> an\n> > empty string appended to the end of the argument list would break the\n> > command. If there is a commit hash in the self.commit string, it will\n> > append it as before.\n> > If the checkpatch script is not meant to be used as a pre-commit hook,\n> > perhaps we should remove the utils/hooks/pre-commit script entirely so\n> > others don't encounter this problem?\n> >\n> > >> I was just wondering if I have something strange in my environment\n> that is\n> > >> causing these issues, or are other folks seeing this as well?\n>\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"","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 F276BBD808\n\tfor ;\n\tThu, 21 Jan 2021 12:59:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BCA0368200;\n\tThu, 21 Jan 2021 13:59:39 +0100 (CET)","from mail-lf1-x129.google.com (mail-lf1-x129.google.com\n\t[IPv6:2a00:1450:4864:20::129])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 17AF6681F4\n\tfor ;\n\tThu, 21 Jan 2021 13:59:38 +0100 (CET)","by mail-lf1-x129.google.com with SMTP id v24so2361001lfr.7\n\tfor ;\n\tThu, 21 Jan 2021 04:59:38 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"M0xY5nft\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=QLpKrkYIP/Q69DHC8uTxuC5WCqN4LiX54jN2l1pdXjw=;\n\tb=M0xY5nfthX3b4K5kQuCdZntyVaKu89uqKMEPViCuBHHlZbY750jAH7ntOibp9Dc3qu\n\t1uy1DmcmTOnfItzHoBeuN+SRAFzx7ZJRt10ty9RbTvwYpDbDmaOi2f8JWW6WSbrB44/z\n\tHZMRuVeNdOrHFVxvZ1o/EGERwxJgkDndx53xbe0h68mOane6cmGrFilUAMzJ99Y6Z06n\n\trW9Z0zFYngCF6Nipfk2TAyQf0QvP4tHYlSG3qj18WoIz8NVIbbe2fllfP/K5NWfM4n21\n\tCVmND8mLO9R6bQklypA+ui6wQmxuFf+UnZENBsTmLMhQDf+67vh1JaX6FdomQt5ZaW2e\n\tPAFA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=QLpKrkYIP/Q69DHC8uTxuC5WCqN4LiX54jN2l1pdXjw=;\n\tb=nPwGAt+K+1o9sNDm3+fXMg6H+za2jtG6nKlcYu6Vo1UtSx8kKSZCXdIIWJqTh3Y7/Q\n\t0T4huYFu+LFin+iV3OHxIV/dd31e0rQuXRumwjjCLOZQmX6n14C2QeqipFxxSxl1c6Fo\n\tSSayOch1aJdpt7ucw0anJKPV6kp4vubz8EsssJbKwxN89PV5j6e6xiB3HSzSBEVUK+VC\n\t/NBPJzzsO32GSRk/immEgbuArOrgno1PovSuYa2Rpf27j2tfy41PSu3pcQ05uzaYt/aW\n\thcE1UtfWbYF7EatYvnpOMn3VOpAnTidAyLdp5nXBA3N0denPjWJQqzGqpm8HITrCtwmz\n\tOekQ==","X-Gm-Message-State":"AOAM533g2bVAZ5IokhB3C5GtBURbkdaYq/XynXXHwWqWeRGPbD45xhD7\n\tsoMiv34cgG4QHzGPPZgU37BTHwSl3SvraG/Nwlmleg==","X-Google-Smtp-Source":"ABdhPJwhjsZ8AarUPAKybOYMfX5zIoKkPHcs/Y+gpQZ2eEkR/E6Gc9MexYbvsil/z4DaSvkqcL0rYCROT3F3CPwpohs=","X-Received":"by 2002:a05:6512:247:: with SMTP id\n\tb7mr6177745lfo.171.1611233976626; \n\tThu, 21 Jan 2021 04:59:36 -0800 (PST)","MIME-Version":"1.0","References":"\n\t\n\t<8417ad8a-0f8d-4b07-90b4-5ad37c0d7215@uajain.com>\n\t\n\t","In-Reply-To":"","From":"Naushir Patuck ","Date":"Thu, 21 Jan 2021 12:59:24 +0000","Message-ID":"","To":"Laurent Pinchart ","Subject":"Re: [libcamera-devel] Problem with utils/checkstyle.py in a\n\tpre-commit hook?","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","Cc":"libcamera devel ","Content-Type":"multipart/mixed;\n\tboundary=\"===============3115930457067600707==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]