Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pPjmH-0001s7-Pt for pgsql-hackers@arkaria.postgresql.org; Wed, 08 Feb 2023 12:42:21 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1pPjmG-0003n6-4h for pgsql-hackers@arkaria.postgresql.org; Wed, 08 Feb 2023 12:42:20 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pPjmF-0003mt-NF for pgsql-hackers@lists.postgresql.org; Wed, 08 Feb 2023 12:42:19 +0000 Received: from relay6-d.mail.gandi.net ([2001:4b98:dc4:8::226]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pPjmB-0005wd-GZ for pgsql-hackers@postgresql.org; Wed, 08 Feb 2023 12:42:18 +0000 Received: (Authenticated sender: adsend@dunslane.net) by mail.gandi.net (Postfix) with ESMTPSA id BBDF6C0009; Wed, 8 Feb 2023 12:42:05 +0000 (UTC) Content-Type: multipart/mixed; boundary="------------bLESqX5hP3Kl1tvmt0ptdxIZ" Message-ID: Date: Wed, 8 Feb 2023 07:41:59 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: run pgindent on a regular basis / scripted manner Content-Language: en-US To: Jelte Fennema Cc: Robert Haas , Tom Lane , Justin Pryzby , Andres Freund , Noah Misch , Peter Geoghegan , Bruce Momjian , Magnus Hagander , Alvaro Herrera , Stephen Frost , Jesse Zhang , pgsql-hackers@postgresql.org References: <20230122094957.x542ojaqgi4lalq4@awork3.anarazel.de> <20230122223806.3sgew6qswhsczae7@awork3.anarazel.de> <1489276.1674427657@sss.pgh.pa.us> <1708030.1675446770@sss.pgh.pa.us> <20230204041848.GC1896331@rfd.leadboat.com> <20230204113453.vmtnayjvhyg5qqqy@alap3.anarazel.de> <1923921.1675526879@sss.pgh.pa.us> <20230204171101.GF1653@telsasoft.com> <2009472.1675532231@sss.pgh.pa.us> <3d67bc80-4de2-5ba8-e272-e4ad2e59ba04@dunslane.net> <4ac8f263-f1bb-faa5-a307-1fffe00f0e3e@dunslane.net> From: Andrew Dunstan In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------bLESqX5hP3Kl1tvmt0ptdxIZ Content-Type: multipart/alternative; boundary="------------Cg0ViFNi9G0RWvWWOmemcIbA" --------------Cg0ViFNi9G0RWvWWOmemcIbA Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2023-02-07 Tu 12:21, Jelte Fennema wrote: >> On Mon, Feb 6, 2023 at 10:21 AM Andrew Dunstan wrote: >> >> Here's a quick patch for 1 and 3. Would also need to adjust the docco. >> >> >> >> This time with patch. > When supplying the --commit flag it still formats all files for me. I > was able to fix that by replacing: > # no non-option arguments given. so do everything in the current directory > $code_base ||= '.' unless @ARGV; > > with: > # no files, dirs or commits given. so do everything in the current directory > $code_base ||= '.' unless @ARGV || @commits; Yeah, thanks for testing. Here's a new patch with that change and the comment adjusted. > > Does the code-base flag still make sense if you can simply pass a > directory as regular args now? Probably not. I'll look into removing it. cheers andrew -- Andrew Dunstan EDB:https://www.enterprisedb.com --------------Cg0ViFNi9G0RWvWWOmemcIbA Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit


On 2023-02-07 Tu 12:21, Jelte Fennema wrote:
On Mon, Feb 6, 2023 at 10:21 AM Andrew Dunstan <andrew@dunslane.net> wrote:

Here's a quick patch for 1 and 3. Would also need to adjust the docco.



This time with patch.

When supplying the --commit flag it still formats all files for me. I
was able to fix that by replacing:
# no non-option arguments given. so do everything in the current directory
$code_base ||= '.' unless @ARGV;

with:
# no files, dirs or commits given. so do everything in the current directory
$code_base ||= '.' unless @ARGV || @commits;


Yeah, thanks for testing. Here's a new patch with that change and the comment adjusted.



Does the code-base flag still make sense if you can simply pass a
directory as regular args now?


Probably not. I'll look into removing it.


cheers


andrew

--
Andrew Dunstan
EDB: https://www.enterprisedb.com
--------------Cg0ViFNi9G0RWvWWOmemcIbA-- --------------bLESqX5hP3Kl1tvmt0ptdxIZ Content-Type: text/x-patch; charset=UTF-8; name="pgindent-directory+git-enhancements-v2.patch" Content-Disposition: attachment; filename="pgindent-directory+git-enhancements-v2.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy90b29scy9wZ2luZGVudC9wZ2luZGVudCBiL3NyYy90b29scy9w Z2luZGVudC9wZ2luZGVudAppbmRleCA1NjY0MGU1NzZhLi4zNGZiN2Q2MDRkIDEwMDc1NQot LS0gYS9zcmMvdG9vbHMvcGdpbmRlbnQvcGdpbmRlbnQKKysrIGIvc3JjL3Rvb2xzL3BnaW5k ZW50L3BnaW5kZW50CkBAIC0yMywxMiArMjMsMTQgQEAgbXkgJGRldm51bGwgPSBGaWxlOjpT cGVjLT5kZXZudWxsOwogCiBteSAoJHR5cGVkZWZzX2ZpbGUsICR0eXBlZGVmX3N0ciwgJGNv ZGVfYmFzZSwKIAlAZXhjbHVkZXMsICAgICAgJGluZGVudCwgICAgICAkYnVpbGQsCi0JJHNo b3dfZGlmZiwgICAgICRzaWxlbnRfZGlmZiwgJGhlbHApOworCSRzaG93X2RpZmYsICAgICAk c2lsZW50X2RpZmYsICRoZWxwLAorCUBjb21taXRzLCk7CiAKICRoZWxwID0gMDsKIAogbXkg JW9wdGlvbnMgPSAoCiAJImhlbHAiICAgICAgICAgICAgICAgPT4gXCRoZWxwLAorCSJjb21t aXQ9cyIgICAgICAgICAgID0+IFxAY29tbWl0cywKIAkidHlwZWRlZnM9cyIgICAgICAgICA9 PiBcJHR5cGVkZWZzX2ZpbGUsCiAJImxpc3Qtb2YtdHlwZWRlZnM9cyIgPT4gXCR0eXBlZGVm X3N0ciwKIAkiY29kZS1iYXNlPXMiICAgICAgICA9PiBcJGNvZGVfYmFzZSwKQEAgLTQ0LDYg KzQ2LDkgQEAgdXNhZ2UoKSBpZiAkaGVscDsKIHVzYWdlKCJDYW5ub3QgaGF2ZSBib3RoIC0t c2lsZW50LWRpZmYgYW5kIC0tc2hvdy1kaWZmIikKICAgaWYgJHNpbGVudF9kaWZmICYmICRz aG93X2RpZmY7CiAKK3VzYWdlKCJDYW5ub3QgdXNlIC0tY29tbWl0IHdpdGggLS1jb2RlLWJh c2Ugb3IgY29tbWFuZCBsaW5lIGZpbGUgbGlzdCIpCisgIGlmIChAY29tbWl0cyAmJiAoJGNv ZGVfYmFzZSB8fCBAQVJHVikpOworCiBydW5fYnVpbGQoJGNvZGVfYmFzZSkgaWYgKCRidWls ZCk7CiAKICMgY29tbWFuZCBsaW5lIG9wdGlvbiB3aW5zLCB0aGVuIGVudmlyb25tZW50ICh3 aGljaCBpcyBob3cgLS1idWlsZCBzZXRzIGl0KSAsCkBAIC01Myw4ICs1OCw5IEBAICR0eXBl ZGVmc19maWxlIHx8PSAkRU5We1BHVFlQRURFRlN9OwogIyBidWlsZCBtb2RlIHNldHMgUEdJ TkRFTlQKICRpbmRlbnQgfHw9ICRFTlZ7UEdJTkRFTlR9IHx8ICRFTlZ7SU5ERU5UfSB8fCAi cGdfYnNkX2luZGVudCI7CiAKLSMgbm8gbm9uLW9wdGlvbiBhcmd1bWVudHMgZ2l2ZW4uIHNv IGRvIGV2ZXJ5dGhpbmcgaW4gdGhlIGN1cnJlbnQgZGlyZWN0b3J5Ci0kY29kZV9iYXNlIHx8 PSAnLicgdW5sZXNzIEBBUkdWOworIyBpZiBubyBub24tb3B0aW9uIGFyZ3VtZW50cyBvciBj b21taXRzIGFyZSBnaXZlbiwgZGVmYXVsdCB0byBsb29raW5nIGluIHRoZQorIyBjdXJyZW50 IGRpcmVjdG9yeQorJGNvZGVfYmFzZSB8fD0gJy4nIHVubGVzcyAoQEFSR1YgfHwgQGNvbW1p dHMpOwogCiBteSAkc291cmNlZGlyID0gbG9jYXRlX3NvdXJjZWRpcigpOwogCkBAIC0zODgs NiArMzk0LDcgQEAgVXNhZ2U6CiBwZ2luZGVudCBbT1BUSU9OXS4uLiBbRklMRV0uLi4KIE9w dGlvbnM6CiAJLS1oZWxwICAgICAgICAgICAgICAgICAgc2hvdyB0aGlzIG1lc3NhZ2UgYW5k IHF1aXQKKyAgICAtLWNvbW1pdD1naXRyZWYgICAgICAgICB1c2UgZmlsZXMgbW9kaWZpZWQg YnkgdGhlIG5hbWVkIGNvbW1pdAogCS0tdHlwZWRlZnM9RklMRSAgICAgICAgIGZpbGUgY29u dGFpbmluZyBhIGxpc3Qgb2YgdHlwZWRlZnMKIAktLWxpc3Qtb2YtdHlwZWRlZnM9U1RSICBz dHJpbmcgY29udGFpbmluZyB0eXBlZGVmcywgc3BhY2Ugc2VwYXJhdGVkCiAJLS1jb2RlLWJh c2U9RElSICAgICAgICAgcGF0aCB0byB0aGUgYmFzZSBvZiBQb3N0Z3JlU1FMIHNvdXJjZSBj b2RlCkBAIC0zOTYsNyArNDAzLDcgQEAgT3B0aW9uczoKIAktLWJ1aWxkICAgICAgICAgICAg ICAgICBidWlsZCB0aGUgcGdfYnNkX2luZGVudCBwcm9ncmFtCiAJLS1zaG93LWRpZmYgICAg ICAgICAgICAgc2hvdyB0aGUgY2hhbmdlcyB0aGF0IHdvdWxkIGJlIG1hZGUKIAktLXNpbGVu dC1kaWZmICAgICAgICAgICBleGl0IHdpdGggc3RhdHVzIDIgaWYgYW55IGNoYW5nZXMgd291 bGQgYmUgbWFkZQotVGhlIC0tZXhjbHVkZXMgb3B0aW9uIGNhbiBiZSBnaXZlbiBtb3JlIHRo YW4gb25jZS4KK1RoZSAtLWV4Y2x1ZGVzIGFuZCAtLWNvbW1pdCBvcHRpb25zIGNhbiBiZSBn aXZlbiBtb3JlIHRoYW4gb25jZS4KIEVPRgogCWlmICgkaGVscCkKIAl7CkBAIC00MTIsMjcg KzQxOSwzOCBAQCBFT0YKIAogIyBtYWluCiAKLSMgZ2V0IHRoZSBsaXN0IG9mIGZpbGVzIHVu ZGVyIGNvZGUgYmFzZSwgaWYgaXQncyBzZXQKLUZpbGU6OkZpbmQ6OmZpbmQoCi0JewotCQl3 YW50ZWQgPT4gc3ViIHsKLQkJCW15ICgkZGV2LCAkaW5vLCAkbW9kZSwgJG5saW5rLCAkdWlk LCAkZ2lkKTsKLQkJCSgoJGRldiwgJGlubywgJG1vZGUsICRubGluaywgJHVpZCwgJGdpZCkg PSBsc3RhdCgkXykpCi0JCQkgICYmIC1mIF8KLQkJCSAgJiYgL14uKlwuW2NoXVx6L3MKLQkJ CSAgJiYgcHVzaChAZmlsZXMsICRGaWxlOjpGaW5kOjpuYW1lKTsKLQkJfQotCX0sCi0JJGNv ZGVfYmFzZSkgaWYgJGNvZGVfYmFzZTsKLQogJGZpbHRlcmVkX3R5cGVkZWZzX2ZoID0gbG9h ZF90eXBlZGVmcygpOwogCiBjaGVja19pbmRlbnQoKTsKIAotIyBhbnkgbm9uLW9wdGlvbiBh cmd1bWVudHMgYXJlIGZpbGVzIHRvIGJlIHByb2Nlc3NlZAotcHVzaChAZmlsZXMsIEBBUkdW KTsKK2J1aWxkX2NsZWFuKCRjb2RlX2Jhc2UpIGlmICRidWlsZDsKIAotIyB0aGUgZXhjbHVk ZSBsaXN0IGFwcGxpZXMgdG8gY29tbWFuZCBsaW5lIGFyZ3VtZW50cyBhcyB3ZWxsIGFzIGZv dW5kIGZpbGVzCitteSAkd2FudGVkID0gc3ViCit7CisJbXkgKCRkZXYsICRpbm8sICRtb2Rl LCAkbmxpbmssICR1aWQsICRnaWQpOworCSgoJGRldiwgJGlubywgJG1vZGUsICRubGluaywg JHVpZCwgJGdpZCkgPSBsc3RhdCgkXykpCisJICAmJiAtZiBfCisJICAmJiAvXi4qXC5bY2hd XHovcworCSAgJiYgcHVzaChAZmlsZXMsICRGaWxlOjpGaW5kOjpuYW1lKTsKK307CisKKyMg Z2V0IHRoZSBsaXN0IG9mIGZpbGVzIHVuZGVyIGNvZGUgYmFzZSwgaWYgaXQncyBzZXQKK0Zp bGU6OkZpbmQ6OmZpbmQoe3dhbnRlZCA9PiAkd2FudGVkIH0sICRjb2RlX2Jhc2UpIGlmICRj b2RlX2Jhc2U7CisKKyMgYW55IG5vbi1vcHRpb24gYXJndW1lbnRzIGFyZSBmaWxlcyBvciBk aXJlY3RvcmllcyB0byBiZSBwcm9jZXNzZWQKK0ZpbGU6OkZpbmQ6OmZpbmQoe3dhbnRlZCA9 PiAkd2FudGVkfSwgQEFSR1YpIGlmIEBBUkdWOworCisjIHByb2Nlc3MgbmFtZWQgY29tbWl0 cyBieSBjb21wYXJpbmcgZWFjaCB3aXRoIHRoZWlyIGltbWVkaWF0ZSBhbmNlc3RvcgorZm9y ZWFjaCBteSAkY29tbWl0IChAY29tbWl0cykKK3sKKwlteSAkcHJldj0iJGNvbW1pdH4iOwor CW15IEBhZmZlY3RlZD1gZ2l0IGRpZmYtdHJlZSAtLW5vLWNvbW1pdC1pZCAtLW5hbWUtb25s eSAtciAkY29tbWl0ICRwcmV2YDsKKwlkaWUgImdpdCBlcnJvciIgaWYgJD87CisJY2hvbXAo QGFmZmVjdGVkKTsKKwlwdXNoKEBmaWxlcyxAYWZmZWN0ZWQpOworfQorCisjIHJlbW92ZSBl eGNsdWRlZCBmaWxlcyBmcm9tIHRoZSBmaWxlIGxpc3QKIHByb2Nlc3NfZXhjbHVkZSgpOwog CiBmb3JlYWNoIG15ICRzb3VyY2VfZmlsZW5hbWUgKEBmaWxlcykKQEAgLTQ4MSw2ICs0OTks NCBAQCBmb3JlYWNoIG15ICRzb3VyY2VfZmlsZW5hbWUgKEBmaWxlcykKIAl9CiB9CiAKLWJ1 aWxkX2NsZWFuKCRjb2RlX2Jhc2UpIGlmICRidWlsZDsKLQogZXhpdCAwOwo= --------------bLESqX5hP3Kl1tvmt0ptdxIZ--