Commitec5f505

adunstan

authored and

pull[bot]

committed

Improve exclude pattern file processing in pgindent

This makes two small changes that will improve pgindent's usefulness ina git hook. First, it looks for the exclude file relative to the currentdirectory. And second, it applies the filters to filenames given on thecommand line as well as those found in a directory sweep.It might prove necessary to make further efforts to find the excludefile, and even to allow multiple exclude files, but for now this shouldbe enough for most purposes.Reviewed by Jelte Fennema

1 parent9d6f4a6 commitec5f505Copy full SHA for ec5f505

File tree

1 file changed

-2

lines changed

src/tools/pgindent
- pgindent

1 file changed

-2

lines changed

`‎src/tools/pgindent/pgindent`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ $code_base \|\|= '.' unless @ARGV;`
`63`	`63`	`$excludes \|\|="$code_base/src/tools/pgindent/exclude_file_patterns"`
`64`	`64`	`if$code_base &&-f"$code_base/src/tools/pgindent/exclude_file_patterns";`
`65`	`65`
	`66`	`+# also look under the current directory for the exclude patterns file`
	`67`	`+$excludes \|\|="src/tools/pgindent/exclude_file_patterns"`
	`68`	`+if-f"src/tools/pgindent/exclude_file_patterns";`
	`69`	`+`
`66`	`70`	`# The typedef list that's mechanically extracted by the buildfarm may omit`
`67`	`71`	`# some names we want to treat like typedefs, e.g. "bool" (which is a macro`
`68`	`72`	`# according to <stdbool.h>), and may include some names we don't want`
`@@ -421,15 +425,16 @@ File::Find::find(`
`421`	`425`	`},`
`422`	`426`	`$code_base)if$code_base;`
`423`	`427`
`424`		`-process_exclude();`
`425`		`-`
`426`	`428`	`$filtered_typedefs_fh = load_typedefs();`
`427`	`429`
`428`	`430`	`check_indent();`
`429`	`431`
`430`	`432`	`# any non-option arguments are files to be processed`
`431`	`433`	`push(@files,@ARGV);`
`432`	`434`
	`435`	`+# the exclude list applies to command line arguments as well as found files`
	`436`	`+process_exclude();`
	`437`	`+`
`433`	`438`	`foreachmy$source_filename (@files)`
`434`	`439`	`{`
`435`	`440`	`# ignore anything that's not a .c or .h file`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitec5f505

File tree

1 file changed

1 file changed

`‎src/tools/pgindent/pgindent`

0 commit comments