[{"id":14341,"web_url":"https://patchwork.libcamera.org/comment/14341/","msgid":"","date":"2020-12-27T10:31:18","subject":"Re: [libcamera-devel] [PATCH 3/8] utils: checkstyle.py: Move commit\n\thandling to a separate section","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2020-12-24 14:28:50 +0200, Laurent Pinchart wrote:\n> To prepare for checkers that operate directly on commits, move the\n> related classes to a separate section. No functional change is included.\n> \n> Signed-off-by: Laurent Pinchart \n\nI trust you that none of the code moved is modified ;-)\n\nReviewed-by: Niklas Söderlund \n\n> ---\n> utils/checkstyle.py | 120 +++++++++++++++++++++++---------------------\n> 1 file changed, 62 insertions(+), 58 deletions(-)\n> \n> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n> index 76267d5ea764..4ba65e5a4ff1 100755\n> --- a/utils/checkstyle.py\n> +++ b/utils/checkstyle.py\n> @@ -190,6 +190,68 @@ def parse_diff(diff):\n> return hunks\n> \n> \n> +# ------------------------------------------------------------------------------\n> +# Commit, Staged Changes & Amendments\n> +#\n> +\n> +class Commit:\n> + def __init__(self, commit):\n> + self.commit = commit\n> +\n> + def get_info(self):\n> + # Get the commit title and list of files.\n> + ret = subprocess.run(['git', 'show', '--pretty=oneline', '--name-only',\n> + self.commit],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> + files = ret.splitlines()\n> + # Returning title and files list as a tuple\n> + return files[0], files[1:]\n> +\n> + def get_diff(self, top_level, filename):\n> + return subprocess.run(['git', 'diff', '%s~..%s' % (self.commit, self.commit),\n> + '--', '%s/%s' % (top_level, filename)],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> +\n> + def get_file(self, filename):\n> + return subprocess.run(['git', 'show', '%s:%s' % (self.commit, filename)],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> +\n> +\n> +class StagedChanges(Commit):\n> + def __init__(self):\n> + Commit.__init__(self, '')\n> +\n> + def get_info(self):\n> + ret = subprocess.run(['git', 'diff', '--staged', '--name-only'],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> + return \"Staged changes\", ret.splitlines()\n> +\n> + def get_diff(self, top_level, filename):\n> + return subprocess.run(['git', 'diff', '--staged', '--',\n> + '%s/%s' % (top_level, filename)],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> +\n> +\n> +class Amendment(StagedChanges):\n> + def __init__(self):\n> + StagedChanges.__init__(self)\n> +\n> + def get_info(self):\n> + # Create a title using HEAD commit\n> + ret = subprocess.run(['git', 'show', '--pretty=oneline', '--no-patch'],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> + title = 'Amendment of ' + ret.strip()\n> + # Extract the list of modified files\n> + ret = subprocess.run(['git', 'diff', '--staged', '--name-only', 'HEAD~'],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> + return title, ret.splitlines()\n> +\n> + def get_diff(self, top_level, filename):\n> + return subprocess.run(['git', 'diff', '--staged', 'HEAD~', '--',\n> + '%s/%s' % (top_level, filename)],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> +\n> +\n> # ------------------------------------------------------------------------------\n> # Helpers\n> #\n> @@ -564,64 +626,6 @@ class StripTrailingSpaceFormatter(Formatter):\n> # Style checking\n> #\n> \n> -class Commit:\n> - def __init__(self, commit):\n> - self.commit = commit\n> -\n> - def get_info(self):\n> - # Get the commit title and list of files.\n> - ret = subprocess.run(['git', 'show', '--pretty=oneline', '--name-only',\n> - self.commit],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> - files = ret.splitlines()\n> - # Returning title and files list as a tuple\n> - return files[0], files[1:]\n> -\n> - def get_diff(self, top_level, filename):\n> - return subprocess.run(['git', 'diff', '%s~..%s' % (self.commit, self.commit),\n> - '--', '%s/%s' % (top_level, filename)],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> -\n> - def get_file(self, filename):\n> - return subprocess.run(['git', 'show', '%s:%s' % (self.commit, filename)],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> -\n> -\n> -class StagedChanges(Commit):\n> - def __init__(self):\n> - Commit.__init__(self, '')\n> -\n> - def get_info(self):\n> - ret = subprocess.run(['git', 'diff', '--staged', '--name-only'],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> - return \"Staged changes\", ret.splitlines()\n> -\n> - def get_diff(self, top_level, filename):\n> - return subprocess.run(['git', 'diff', '--staged', '--',\n> - '%s/%s' % (top_level, filename)],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> -\n> -\n> -class Amendment(StagedChanges):\n> - def __init__(self):\n> - StagedChanges.__init__(self)\n> -\n> - def get_info(self):\n> - # Create a title using HEAD commit\n> - ret = subprocess.run(['git', 'show', '--pretty=oneline', '--no-patch'],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> - title = 'Amendment of ' + ret.strip()\n> - # Extract the list of modified files\n> - ret = subprocess.run(['git', 'diff', '--staged', '--name-only', 'HEAD~'],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> - return title, ret.splitlines()\n> -\n> - def get_diff(self, top_level, filename):\n> - return subprocess.run(['git', 'diff', '--staged', 'HEAD~', '--',\n> - '%s/%s' % (top_level, filename)],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> -\n> -\n> def check_file(top_level, commit, filename):\n> # Extract the line numbers touched by the commit.\n> diff = commit.get_diff(top_level, filename)\n> -- \n> Regards,\n> \n> Laurent Pinchart\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 46785C0F1B\n\tfor ;\n\tSun, 27 Dec 2020 10:31:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0BF57615B0;\n\tSun, 27 Dec 2020 11:31:23 +0100 (CET)","from mail-lf1-x142.google.com (mail-lf1-x142.google.com\n\t[IPv6:2a00:1450:4864:20::142])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 62B81615AC\n\tfor ;\n\tSun, 27 Dec 2020 11:31:21 +0100 (CET)","by mail-lf1-x142.google.com with SMTP id h22so18030904lfu.2\n\tfor ;\n\tSun, 27 Dec 2020 02:31:21 -0800 (PST)","from localhost ([185.224.57.161]) by smtp.gmail.com with ESMTPSA id\n\tl8sm5052649lfk.120.2020.12.27.02.31.19\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSun, 27 Dec 2020 02:31:20 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"2FhCIRsM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=cQupxMIXGmxF24qwNhc1JndeZjd8Awt0DnlhzITxlzQ=;\n\tb=2FhCIRsMULxHHHejGzxcdyIQOC4c/uuXwYnzXKB0nHE5ll4+bsLGMNTDPOP3aXD1ie\n\tnLyoSK2TOBTcGOGH/RsJTRRAIP7RFdZnYsl/6ulBN/6JqTPCKyPcvH9RKejiFz6+RMzG\n\tf1zDssD+KDtCm7Rj1UF6PGUyFtBIjeX4WVwKq/DiRept/5Q/RFK2EPxQJK0jtaZg40O1\n\t8M97afdEr/ERrHwq04e/Qw7oUaAwo3CJE1tGpYQHBOG7+W25a1pwX9ccqaYRgmryn5XX\n\t78fIRVmCZkVUQiGqpuq9d6wfv9FlWJOLWXP2ohYEen7O+jvv9d6RpJmqBcWmP3ucZeCs\n\tieQQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=cQupxMIXGmxF24qwNhc1JndeZjd8Awt0DnlhzITxlzQ=;\n\tb=gdNot9pqsKWxUF/hvTj2e4NZzKXlpudE3Esiktv+bCpYaXEnpts9pljYjlQUzLHLXK\n\tYaoFckzHV5E4MfBuZ48B7rIPtVktR4+ZQ1emvzRrY7t/d/MI5Y2e047X8d/qHRZZ8RpY\n\t8cs3ybTNTssUv3Ogo2F1gY4/IrMgMCdB82RzDZgZyBCCye0IPdH+0jj1zHW7iYhMZXt7\n\tP7J2obNgkBEdFJb9WwiL3hr805TtGR6FhqLv+Ah7jQBbBUJ14DEIjfNFctkBYImptgoD\n\tOpizaKco2wFJltBtRV9SGMpODYCHD3TL79pY5yrluKIgPxvXRUdkDMN7veS/UHhaPqvX\n\t1yyw==","X-Gm-Message-State":"AOAM533u/9bCzy+1clt3tsvds8tywcWiF38g/g9onHmRJbTfP0Fg9ODW\n\t7nP99/FTmwT7qh+5B+U6Aso/Dg==","X-Google-Smtp-Source":"ABdhPJyf5caymQylX4E0HBwlhwA87IdwEvWgmsrxtdCmANzjk0ADdUh6DwP8nWE95DqxINV8lhvSUg==","X-Received":"by 2002:a2e:780d:: with SMTP id\n\tt13mr18968818ljc.144.1609065080885; \n\tSun, 27 Dec 2020 02:31:20 -0800 (PST)","Date":"Sun, 27 Dec 2020 11:31:18 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Message-ID":"","References":"<20201224122855.22200-1-laurent.pinchart@ideasonboard.com>\n\t<20201224122855.22200-4-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201224122855.22200-4-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 3/8] utils: checkstyle.py: Move commit\n\thandling to a separate section","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@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14364,"web_url":"https://patchwork.libcamera.org/comment/14364/","msgid":"<20201228051516.GC1933@pyrite.rasen.tech>","date":"2020-12-28T05:15:16","subject":"Re: [libcamera-devel] [PATCH 3/8] utils: checkstyle.py: Move commit\n\thandling to a separate section","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nOn Thu, Dec 24, 2020 at 02:28:50PM +0200, Laurent Pinchart wrote:\n> To prepare for checkers that operate directly on commits, move the\n> related classes to a separate section. No functional change is included.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Paul Elder \n\n> ---\n> utils/checkstyle.py | 120 +++++++++++++++++++++++---------------------\n> 1 file changed, 62 insertions(+), 58 deletions(-)\n> \n> diff --git a/utils/checkstyle.py b/utils/checkstyle.py\n> index 76267d5ea764..4ba65e5a4ff1 100755\n> --- a/utils/checkstyle.py\n> +++ b/utils/checkstyle.py\n> @@ -190,6 +190,68 @@ def parse_diff(diff):\n> return hunks\n> \n> \n> +# ------------------------------------------------------------------------------\n> +# Commit, Staged Changes & Amendments\n> +#\n> +\n> +class Commit:\n> + def __init__(self, commit):\n> + self.commit = commit\n> +\n> + def get_info(self):\n> + # Get the commit title and list of files.\n> + ret = subprocess.run(['git', 'show', '--pretty=oneline', '--name-only',\n> + self.commit],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> + files = ret.splitlines()\n> + # Returning title and files list as a tuple\n> + return files[0], files[1:]\n> +\n> + def get_diff(self, top_level, filename):\n> + return subprocess.run(['git', 'diff', '%s~..%s' % (self.commit, self.commit),\n> + '--', '%s/%s' % (top_level, filename)],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> +\n> + def get_file(self, filename):\n> + return subprocess.run(['git', 'show', '%s:%s' % (self.commit, filename)],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> +\n> +\n> +class StagedChanges(Commit):\n> + def __init__(self):\n> + Commit.__init__(self, '')\n> +\n> + def get_info(self):\n> + ret = subprocess.run(['git', 'diff', '--staged', '--name-only'],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> + return \"Staged changes\", ret.splitlines()\n> +\n> + def get_diff(self, top_level, filename):\n> + return subprocess.run(['git', 'diff', '--staged', '--',\n> + '%s/%s' % (top_level, filename)],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> +\n> +\n> +class Amendment(StagedChanges):\n> + def __init__(self):\n> + StagedChanges.__init__(self)\n> +\n> + def get_info(self):\n> + # Create a title using HEAD commit\n> + ret = subprocess.run(['git', 'show', '--pretty=oneline', '--no-patch'],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> + title = 'Amendment of ' + ret.strip()\n> + # Extract the list of modified files\n> + ret = subprocess.run(['git', 'diff', '--staged', '--name-only', 'HEAD~'],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> + return title, ret.splitlines()\n> +\n> + def get_diff(self, top_level, filename):\n> + return subprocess.run(['git', 'diff', '--staged', 'HEAD~', '--',\n> + '%s/%s' % (top_level, filename)],\n> + stdout=subprocess.PIPE).stdout.decode('utf-8')\n> +\n> +\n> # ------------------------------------------------------------------------------\n> # Helpers\n> #\n> @@ -564,64 +626,6 @@ class StripTrailingSpaceFormatter(Formatter):\n> # Style checking\n> #\n> \n> -class Commit:\n> - def __init__(self, commit):\n> - self.commit = commit\n> -\n> - def get_info(self):\n> - # Get the commit title and list of files.\n> - ret = subprocess.run(['git', 'show', '--pretty=oneline', '--name-only',\n> - self.commit],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> - files = ret.splitlines()\n> - # Returning title and files list as a tuple\n> - return files[0], files[1:]\n> -\n> - def get_diff(self, top_level, filename):\n> - return subprocess.run(['git', 'diff', '%s~..%s' % (self.commit, self.commit),\n> - '--', '%s/%s' % (top_level, filename)],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> -\n> - def get_file(self, filename):\n> - return subprocess.run(['git', 'show', '%s:%s' % (self.commit, filename)],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> -\n> -\n> -class StagedChanges(Commit):\n> - def __init__(self):\n> - Commit.__init__(self, '')\n> -\n> - def get_info(self):\n> - ret = subprocess.run(['git', 'diff', '--staged', '--name-only'],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> - return \"Staged changes\", ret.splitlines()\n> -\n> - def get_diff(self, top_level, filename):\n> - return subprocess.run(['git', 'diff', '--staged', '--',\n> - '%s/%s' % (top_level, filename)],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> -\n> -\n> -class Amendment(StagedChanges):\n> - def __init__(self):\n> - StagedChanges.__init__(self)\n> -\n> - def get_info(self):\n> - # Create a title using HEAD commit\n> - ret = subprocess.run(['git', 'show', '--pretty=oneline', '--no-patch'],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> - title = 'Amendment of ' + ret.strip()\n> - # Extract the list of modified files\n> - ret = subprocess.run(['git', 'diff', '--staged', '--name-only', 'HEAD~'],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> - return title, ret.splitlines()\n> -\n> - def get_diff(self, top_level, filename):\n> - return subprocess.run(['git', 'diff', '--staged', 'HEAD~', '--',\n> - '%s/%s' % (top_level, filename)],\n> - stdout=subprocess.PIPE).stdout.decode('utf-8')\n> -\n> -\n> def check_file(top_level, commit, filename):\n> # Extract the line numbers touched by the commit.\n> diff = commit.get_diff(top_level, filename)\n> -- \n> Regards,\n> \n> Laurent Pinchart\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 C67A5C0F1A\n\tfor ;\n\tMon, 28 Dec 2020 05:15:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 91DB960525;\n\tMon, 28 Dec 2020 06:15:24 +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 1BFCE6031B\n\tfor ;\n\tMon, 28 Dec 2020 06:15:23 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AE15B25C;\n\tMon, 28 Dec 2020 06:15:21 +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=\"H3dSkyAC\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1609132522;\n\tbh=ulEjugVzZRkcc/OYRYxv3hDO3zFy4PhUAoJ83Q5OYNw=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=H3dSkyACunUEkJNgj4uh0DHN++2qQlQC0BjWK8r8EOqbuvxZ5i1QpaYIn/uEVH4sR\n\t7UY5R6f0tTc9A3zvugiBY/dfs4AW5z0NfBDVVUKEEhvknsjE6w9j5s1yxV/Kz/U7lv\n\tZnF4YdDnkUP7yTiXuXobH8+zd3YV8rgwrrtYubK8=","Date":"Mon, 28 Dec 2020 14:15:16 +0900","From":"paul.elder@ideasonboard.com","To":"Laurent Pinchart ","Message-ID":"<20201228051516.GC1933@pyrite.rasen.tech>","References":"<20201224122855.22200-1-laurent.pinchart@ideasonboard.com>\n\t<20201224122855.22200-4-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201224122855.22200-4-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 3/8] utils: checkstyle.py: Move commit\n\thandling to a separate section","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@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]