From nobody Mon Apr 25 17:35:16 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 57E8219976FF; Mon, 25 Apr 2022 17:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KnBx023S7z3swT; Mon, 25 Apr 2022 17:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650908116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PhcfCGk2zo64ObavMyee+j992ZBUepduT/3X2yIyayo=; b=Z1BupgJaJr7QmLE8z3pz6g2ChGaXoy8NeadbvtLM73smPOTsC/2MsqxyGtwtOGbIxme9nl vkj4f4pHyXoopKvIoiWgoqkAnEu33/tfSNBzb9rh2JjuwwlT3i/a8sSRANkxtad0Bj0MnX CQwYXFaPG6letuSszEMFG74zwZhFKJ9SbUDvOJ+Wi+S1Lhi6M8n+fYaBEDHF45/td7X+iA BvZLdfcpG3YgPxEspZF6eGQFSL0e7+rNZb6rB/YGfZEG8q+ZUMauqkvhG1aHcy5Tm2Yy6v VS3OqvsVaxgxBHfx1kgD2Fa81nW+52zqPAzGOvc1+Ny74QyU6WxnB53K7E6FnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 232501F28C; Mon, 25 Apr 2022 17:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23PHZG9e090410; Mon, 25 Apr 2022 17:35:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23PHZGiA090409; Mon, 25 Apr 2022 17:35:16 GMT (envelope-from git) Date: Mon, 25 Apr 2022 17:35:16 GMT Message-Id: <202204251735.23PHZGiA090409@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 27bebbf28a72 - main - framework: add hook to check indentation of conditionals of Mk/ files List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27bebbf28a72ab5286623603611c5c0e39b6a4c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650908116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PhcfCGk2zo64ObavMyee+j992ZBUepduT/3X2yIyayo=; b=GmMQK1l+1YldRlZzz/I4plNbGfO+PHPNgaqL6tbX2rdjRMKAbrQhWuLQNqUk1YVw1f21hV 8onY0+2IqJvx9WAw0xPOeFQB8R2L/rXPmSIcJ5JSSkXWic94HpkoTv9Af8at8rGOaEMn38 2iTZm0Fw3MLge91NTsk79UtUGAR1rl4K6dbwTsy7z5kaLpsizkcmTuVtOu+0VEQzn5vKEj 02nubfLgyu68BRbo0lXwkdPt870lwNxYze8DDduIzouQzyPqHCqCtnjyZf02L7ogOEVdBx LKkqM109V952Koq/yg90kMM6aTQ0C0uP7IhYm8hi9sCtZrhxo1I8p8g4e4fJdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650908116; a=rsa-sha256; cv=none; b=WnBEk6W+xFKioyE4kP807NeNqGvhM6utUSqHacX2I70CrBzpupJvrrPPdKSYDxBkzPW4tT sb5kYDa9FuV3HjCvVUcIEFjs3R+8YS/gI13hFk5Mv/BMNIF2cvgCx7u3uTHnVZpHssXQog WwMMU6G80tWyJeKpA9WZG70YXWI5L2wovniy7pvgFkIzgWw/kMpKqVSchqORCjI+HJqTuh IBNlRbsHcKyvkBsw3DfwuJLv6tW9WS+XLUJUcLL9+4RDO6c5lEnTb1r2Z2nB5UAjst2Idq MCGpte7wVIyD9ldCx/r9sVHkwyJHzdThPqqR5D5JQiuK0bs1JzBHbk1ts4s//w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=27bebbf28a72ab5286623603611c5c0e39b6a4c8 commit 27bebbf28a72ab5286623603611c5c0e39b6a4c8 Author: Tobias C. Berner AuthorDate: 2022-04-24 10:54:43 +0000 Commit: Tobias C. Berner CommitDate: 2022-04-25 17:34:55 +0000 framework: add hook to check indentation of conditionals of Mk/ files This adds a further pre-commit hook to enforce indentations in Mk/* Usage: > vim Mk/Uses/tcl.mk [add/remove some whitespaces between a `.` and an `if`] > git add Mk/Uses/tcl.mk > git commit -m "Mk/Uses/tcl.mk: test hook" [pre-commit] tcl.mk is not properly indented -- please use /tmp/check_indentations-tcl.mk.LShfR7TD48/tcl.mk which was created using Tools/scripts/indent_make_if.pl Reminder: to make use of the hooks provided by the ports tree use the following from [1] Add the prepare-commit-msg hook to the repository. To make use of it, the easiest way is to run: git config --add core.hooksPath .hooks [1] bbc2474ef7a65eb8561c8ecf7af80c2bfed1f248 Reviewed by: portmgr (rene) Differential Revision: https://reviews.freebsd.org/D35041 --- .hooks/pre-commit.d/check_mk_indentations | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.hooks/pre-commit.d/check_mk_indentations b/.hooks/pre-commit.d/check_mk_indentations new file mode 100755 index 000000000000..00fdb16f24cf --- /dev/null +++ b/.hooks/pre-commit.d/check_mk_indentations @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Check that Mk/ files are properly indented +# + +check_indentation() { + local mkfile="$1" + local name=$(echo "${mkfile}" | awk -F / '{print $NF}') + local tempdir=$(mktemp -d -t check_indentations-${name}) + if [ $? -ne 0 ] ; then + echo "[pre-commit] failed to create tempdir" + exit 2 + fi + cp ${mkfile} ${tempdir} && Tools/scripts/indent_make_if.pl ${tempdir}/${name} + if [ $? -ne 0 ] ; then + echo "[pre-commit] failed to run Tools/scripts/indent_make_if.pl" + exit 2 + fi + cmp -s ${tempdir}/* + if [ $? -ne 0 ] ; then + echo "[pre-commit] ${name} is not properly indented -- please use ${tempdir}/${name} which was created using Tools/scripts/indent_make_if.pl" + exit 1 + fi +} + +modified_mks=$(git diff --name-only --cached --diff-filter=ACRM | grep -E '^Mk/.*\.mk$') +if [ $? -eq 0 ] ; then + for modified_mk in ${modified_mks} ; do + check_indentation "${modified_mk}" + done +fi