Commitc3fc83f

committed

Add missing rules to match hierarchy path

1 parent16d3ebf commitc3fc83fCopy full SHA for c3fc83f

File tree

+24

-12

lines changed

+24

-12

lines changed

Lines changed: 16 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -467,20 +467,24 @@ def _included_paths(self):`
`467`	`467`	`keyword=match.group(1)`
`468`	`468`	`value=match.group(2).strip()`
`469`	`469`
`470`		`-ifkeyword=="gitdir":`
`471`		`-value=osp.expanduser(value)`
`472`		`-iffnmatch.fnmatchcase(self._repo.git_dir,value):`
`473`		`-paths+=self.items(section)`
`474`		`-`
`475`		`-elifkeyword=="gitdir/i":`
	`470`	`+ifkeywordin ["gitdir","gitdir/i"]:`
`476`	`471`	`value=osp.expanduser(value)`
`477`	`472`
`478`		`-# Ensure that glob is always case insensitive.`
`479`		`-value=re.sub(`
`480`		`-r"[a-zA-Z]",`
`481`		`-lambdam:f"[{m.group().lower()}{m.group().upper()}]",`
`482`		`-value`
`483`		`- )`
	`473`	`+ifnotany(value.startswith(s)forsin ["./","/"]):`
	`474`	`+value="**/"+value`
	`475`	`+ifvalue.endswith("/"):`
	`476`	`+value+="**"`
	`477`	`+`
	`478`	`+# Ensure that glob is always case insensitive if required.`
	`479`	`+ifkeyword.endswith("/i"):`
	`480`	`+value=re.sub(`
	`481`	`+r"[a-zA-Z]",`
	`482`	`+lambdam:"[{}{}]".format(`
	`483`	`+m.group().lower(),`
	`484`	`+m.group().upper()`
	`485`	`+ ),`
	`486`	`+value`
	`487`	`+ )`
`484`	`488`
`485`	`489`	`iffnmatch.fnmatchcase(self._repo.git_dir,value):`
`486`	`490`	`paths+=self.items(section)`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,14 @@ def test_conditional_includes_from_git_dir(self, rw_dir):`
`299`	`299`	`assertnotconfig._has_includes()`
`300`	`300`	`assertconfig._included_paths()== []`
`301`	`301`
	`302`	`+# Ensure that config is included if path in hierarchy.`
	`303`	`+withopen(path1,"w")asstream:`
	`304`	`+stream.write(template.format("gitdir","target1/",path2))`
	`305`	`+`
	`306`	`+withGitConfigParser(path1,repo=repo)asconfig:`
	`307`	`+assertconfig._has_includes()`
	`308`	`+assertconfig._included_paths()== [("path",path2)]`
	`309`	`+`
`302`	`310`	`@with_rw_directory`
`303`	`311`	`deftest_conditional_includes_from_branch_name(self,rw_dir):`
`304`	`312`	`# Initiate mocked branch`

Comments

(0)