{"id":2678,"url":"https://patchwork.libcamera.org/api/1.1/patches/2678/?format=json","web_url":"https://patchwork.libcamera.org/patch/2678/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200118200015.16531-5-nicolas@ndufresne.ca>","date":"2020-01-18T20:00:13","name":"[libcamera-devel,v4,4/6] checkstyle: Add support for checking style on staged changes","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0921859471d97d1b2aac15fd25591e444254ccc1","submitter":{"id":30,"url":"https://patchwork.libcamera.org/api/1.1/people/30/?format=json","name":"Nicolas Dufresne","email":"nicolas@ndufresne.ca"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2678/mbox/","series":[{"id":636,"url":"https://patchwork.libcamera.org/api/1.1/series/636/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=636","date":"2020-01-18T20:00:09","name":"Add the ability to do pre-commit style check","version":4,"mbox":"https://patchwork.libcamera.org/series/636/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2678/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2678/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BA0D160455\n\tfor ;\n\tSat, 18 Jan 2020 21:02:52 +0100 (CET)","from nicolas-tpx395.localdomain (unknown\n\t[IPv6:2002:c0de:c115:0:66fc:8b:2a38:8313])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits))\n\t(No client certificate requested) (Authenticated sender: nicolas)\n\tby bhuna.collabora.co.uk (Postfix) with ESMTPSA id 6BEBE2911C1;\n\tSat, 18 Jan 2020 20:02:50 +0000 (GMT)"],"From":"Nicolas Dufresne ","To":"libcamera-devel@lists.libcamera.org","Cc":"Nicolas Dufresne ,\n\tLaurent Pinchart ","Date":"Sat, 18 Jan 2020 15:00:13 -0500","Message-Id":"<20200118200015.16531-5-nicolas@ndufresne.ca>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200118200015.16531-1-nicolas@ndufresne.ca>","References":"<20200118200015.16531-1-nicolas@ndufresne.ca>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 4/6] checkstyle: Add support for\n\tchecking style on staged changes","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":"Sat, 18 Jan 2020 20:02:52 -0000"},"content":"From: Nicolas Dufresne \n\nThis introduces a new command line \"--staged\" and a new special type of\ncommit \"StagedChanges\". It will check the style of changes that are in\nthe index, so the changes that would be committed by \"git commit\".\n\n\"--staged\" was chosen to match with \"git diff --staged\" command line.\nOther valid name could have been \"--index\" or \"--cached\". This was\nmy personal preference, aliases can be added later. Note that we must\nnot confuse this with working tree changes, as these changes are not\npicked by \"git commit\".\n\nThis feature is needed to implement pre-commit hook.\n\nSigned-off-by: Nicolas Dufresne \nReviewed-by: Laurent Pinchart \n---\n utils/checkstyle.py | 32 ++++++++++++++++++++++++++++++--\n 1 file changed, 30 insertions(+), 2 deletions(-)","diff":"diff --git a/utils/checkstyle.py b/utils/checkstyle.py\nindex d928a5f..e7c3ae2 100755\n--- a/utils/checkstyle.py\n+++ b/utils/checkstyle.py\n@@ -481,6 +481,21 @@ class Commit:\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 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@@ -611,7 +626,9 @@ def main(argv):\n parser = argparse.ArgumentParser()\n parser.add_argument('--formatter', '-f', type=str, choices=['astyle', 'clang-format'],\n help='Code formatter. Default to clang-format if not specified.')\n- parser.add_argument('revision_range', type=str, default='HEAD', nargs='?',\n+ parser.add_argument('--staged', '-s', action='store_true',\n+ help='Include the changes in the index. Defaults to False')\n+ parser.add_argument('revision_range', type=str, default=None, nargs='?',\n help='Revision range (as defined by git rev-parse). Defaults to HEAD if not specified.')\n args = parser.parse_args(argv[1:])\n \n@@ -646,7 +663,18 @@ def main(argv):\n if top_level is None:\n return 1\n \n- commits = extract_commits(args.revision_range)\n+ commits = []\n+ if args.staged:\n+ commits.append(StagedChanges())\n+\n+ # If not --staged\n+ if len(commits) == 0:\n+ # And no revisions were passed, then default to HEAD\n+ if not args.revision_range:\n+ args.revision_range = 'HEAD'\n+\n+ if args.revision_range:\n+ commits += extract_commits(args.revision_range)\n \n issues = 0\n for commit in commits:\n","prefixes":["libcamera-devel","v4","4/6"]}