Commit2bbb6ee

committed

IndexFile._to_relative_path - fix case where absolute path gets stripped of trailing slash

1 parentfe7533e commit2bbb6eeCopy full SHA for 2bbb6ee

File tree

+26

-1

lines changed

+26

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,10 @@ def _to_relative_path(self, path: PathLike) -> PathLike:`
`655`	`655`	`raiseInvalidGitRepositoryError("require non-bare repository")`
`656`	`656`	`ifnotosp.normpath(str(path)).startswith(str(self.repo.working_tree_dir)):`
`657`	`657`	`raiseValueError("Absolute path %r is not in git repository at %r"% (path,self.repo.working_tree_dir))`
`658`		`-returnos.path.relpath(path,self.repo.working_tree_dir)`
	`658`	`+result=os.path.relpath(path,self.repo.working_tree_dir)`
	`659`	`+ifstr(path).endswith(os.sep)andnotresult.endswith(os.sep):`
	`660`	`+result+=os.sep`
	`661`	`+returnresult`
`659`	`662`
`660`	`663`	`def_preprocess_add_items(`
`661`	`664`	`self,items:Union[PathLike,Sequence[Union[PathLike,Blob,BaseIndexEntry,"Submodule"]]]`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`importsubprocess`
`17`	`17`	`importsys`
`18`	`18`	`importtempfile`
	`19`	`+fromunittestimportmock`
`19`	`20`
`20`	`21`	`fromgitdb.baseimportIStream`
`21`	`22`
`@@ -1015,6 +1016,27 @@ class Mocked:`
`1015`	`1016`	`rel=index._to_relative_path(path)`
`1016`	`1017`	`self.assertEqual(rel,os.path.relpath(path,root))`
`1017`	`1018`
	`1019`	`+deftest__to_relative_path_absolute_trailing_slash(self):`
	`1020`	`+repo_root=os.path.join(osp.abspath(os.sep),"directory1","repo_root")`
	`1021`	`+`
	`1022`	`+classMocked:`
	`1023`	`+bare=False`
	`1024`	`+git_dir=repo_root`
	`1025`	`+working_tree_dir=repo_root`
	`1026`	`+`
	`1027`	`+repo=Mocked()`
	`1028`	`+path=os.path.join(repo_root,"directory2/")`
	`1029`	`+index=IndexFile(repo)`
	`1030`	`+`
	`1031`	`+expected_path="directory2/"`
	`1032`	`+actual_path=index._to_relative_path(path)`
	`1033`	`+self.assertEqual(expected_path,actual_path)`
	`1034`	`+`
	`1035`	`+withmock.patch("git.index.base.os.path")asospath_mock:`
	`1036`	`+ospath_mock.relpath.return_value="directory2/"`
	`1037`	`+actual_path=index._to_relative_path(path)`
	`1038`	`+self.assertEqual(expected_path,actual_path)`
	`1039`	`+`
`1018`	`1040`	`@pytest.mark.xfail(`
`1019`	`1041`	`type(_win_bash_status)isWinBashStatus.Absent,`
`1020`	`1042`	`reason="Can't run a hook on Windows without bash.exe.",`

Comments

(0)