Commitd986a59

authored

Merge pull request#1778 from stegm/fix_index_with_pathlike

Fix if items of Index is of type PathLike

2 parentsc398d79 +6e4cee4 commitd986a59Copy full SHA for d986a59

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -940,7 +940,7 @@ def _items_to_rela_paths(`
`940`	`940`	`foriteminitems:`
`941`	`941`	`ifisinstance(item, (BaseIndexEntry, (Blob,Submodule))):`
`942`	`942`	`paths.append(self._to_relative_path(item.path))`
`943`		`-elifisinstance(item,str):`
	`943`	`+elifisinstance(item,(str,os.PathLike)):`
`944`	`944`	`paths.append(self._to_relative_path(item))`
`945`	`945`	`else:`
`946`	`946`	`raiseTypeError("Invalid item type: %r"%item)`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -558,14 +558,16 @@ def test_index_mutation(self, rw_repo):`
`558`	`558`	`defmixed_iterator():`
`559`	`559`	`count=0`
`560`	`560`	`forentryinindex.entries.values():`
`561`		`-type_id=count%4`
`562`		`-iftype_id==0:# path`
	`561`	`+type_id=count%5`
	`562`	`+iftype_id==0:# path (str)`
`563`	`563`	`yieldentry.path`
`564`		`-eliftype_id==1:# blob`
	`564`	`+eliftype_id==1:# path (PathLike)`
	`565`	`+yieldPath(entry.path)`
	`566`	`+eliftype_id==2:# blob`
`565`	`567`	`yieldBlob(rw_repo,entry.binsha,entry.mode,entry.path)`
`566`		`-eliftype_id==2:# BaseIndexEntry`
	`568`	`+eliftype_id==3:# BaseIndexEntry`
`567`	`569`	`yieldBaseIndexEntry(entry[:4])`
`568`		`-eliftype_id==3:# IndexEntry`
	`570`	`+eliftype_id==4:# IndexEntry`
`569`	`571`	`yieldentry`
`570`	`572`	`else:`
`571`	`573`	`raiseAssertionError("Invalid Type")`

Comments

(0)