Commit0857d33

authored and

committed

git: index: base: use os.path.relpath

Fixes#743Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>

1 parente79a3f8 commit0857d33Copy full SHA for 0857d33

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -561,10 +561,9 @@ def _to_relative_path(self, path):`
`561`	`561`	`returnpath`
`562`	`562`	`ifself.repo.bare:`
`563`	`563`	`raiseInvalidGitRepositoryError("require non-bare repository")`
`564`		`-relative_path=path.replace(self.repo.working_tree_dir+os.sep,"")`
`565`		`-ifrelative_path==path:`
	`564`	`+ifnotpath.startswith(self.repo.working_tree_dir):`
`566`	`565`	`raiseValueError("Absolute path %r is not in git repository at %r"% (path,self.repo.working_tree_dir))`
`567`		`-returnrelative_path`
	`566`	`+returnos.path.relpath(path,self.repo.working_tree_dir)`
`568`	`567`
`569`	`568`	`def_preprocess_add_items(self,items):`
`570`	`569`	`""" Split the items into two lists of path strings and BaseEntries. """`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -838,6 +838,21 @@ def test_add_a_file_with_wildcard_chars(self, rw_dir):`
`838`	`838`	`r.index.add([fp])`
`839`	`839`	`r.index.commit('Added [.exe')`
`840`	`840`
	`841`	`+deftest__to_relative_path_at_root(self):`
	`842`	`+root=osp.abspath(os.sep)`
	`843`	`+`
	`844`	`+classMocked(object):`
	`845`	`+bare=False`
	`846`	`+git_dir=root`
	`847`	`+working_tree_dir=root`
	`848`	`+`
	`849`	`+repo=Mocked()`
	`850`	`+path=os.path.join(root,'file')`
	`851`	`+index=IndexFile(repo)`
	`852`	`+`
	`853`	`+rel=index._to_relative_path(path)`
	`854`	`+self.assertEqual(rel,os.path.relpath(path,root))`
	`855`	`+`
`841`	`856`	`@with_rw_repo('HEAD',bare=True)`
`842`	`857`	`deftest_pre_commit_hook_success(self,rw_repo):`
`843`	`858`	`index=rw_repo.index`

Comments

(0)