Commit5938ae3

and

committed

fix: resolve relative includes from relative config paths

Co-authored-by: Byron <63622+Byron@users.noreply.github.com>

1 parent6c7843a commit5938ae3Copy full SHA for 5938ae3

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,8 @@ def read(self) -> None: # type: ignore[override]`
`661`	`661`	`continue`
`662`	`662`	`# END ignore relative paths if we don't know the configuration file path`
`663`	`663`	`file_path=cast(PathLike,file_path)`
`664`		`-assertosp.isabs(file_path),"Need absolute paths to be sure our cycle checks will work"`
	`664`	`+ifnotosp.isabs(file_path):`
	`665`	`+file_path=osp.abspath(file_path)`
`665`	`666`	`include_path=osp.join(osp.dirname(file_path),include_path)`
`666`	`667`	`# END make include path absolute`
`667`	`668`	`include_path=osp.normpath(include_path)`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,17 @@ def check_test_value(cr, value):`
`246`	`246`	`withGitConfigParser(fpa,read_only=True)ascr:`
`247`	`247`	`check_test_value(cr,tv)`
`248`	`248`
	`249`	`+@with_rw_directory`
	`250`	`+deftest_relative_include_with_relative_config_path(self,rw_dir):`
	`251`	`+fpa=osp.join(rw_dir,"a")`
	`252`	`+fpb=osp.join(rw_dir,"b")`
	`253`	`+withGitConfigParser(fpb,read_only=False)ascw:`
	`254`	`+cw.set_value("b","value","b")`
	`255`	`+withGitConfigParser(fpa,read_only=False)ascw:`
	`256`	`+cw.set_value("include","path","b")`
	`257`	`+withGitConfigParser(osp.relpath(fpa),read_only=True)ascr:`
	`258`	`+assertcr.get_value("b","value")=="b"`
	`259`	`+`
`249`	`260`	`@with_rw_directory`
`250`	`261`	`deftest_multiple_include_paths_with_same_key(self,rw_dir):`
`251`	`262`	`"""Test that multiple 'path' entries under [include] are all respected.`

Comments

(0)