Commitb03af05

committed

Remove defsult_index decorator from diff() and do check within function. Breaks typechecking for some reason

1 parent9bb630f commitb03af05Copy full SHA for b03af05

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1271,10 +1271,10 @@ def reset(self, commit: Union[Commit, 'Reference', str] = 'HEAD', working_tree:`
`1271`	`1271`
`1272`	`1272`	`returnself`
`1273`	`1273`
`1274`		`-@default_index`
	`1274`	`+#@ default_index, breaks typing for some reason, copied into function`
`1275`	`1275`	`defdiff(self,`
`1276`	`1276`	`other:Union[git_diff.Diffable.Index,'IndexFile.Index',Treeish,None,object]=git_diff.Diffable.Index,`
`1277`		`-paths:Union[str,List[PathLike],Tuple[PathLike, ...],None]=None,`
	`1277`	`+paths:Union[PathLike,List[PathLike],Tuple[PathLike, ...],None]=None,`
`1278`	`1278`	`create_patch:bool=False,**kwargs:Any`
`1279`	`1279`	`)->git_diff.DiffIndex:`
`1280`	`1280`	`"""Diff this index against the working copy or a Tree or Commit object`
`@@ -1286,6 +1286,11 @@ def diff(self,`
`1286`	`1286`	`Will only work with indices that represent the default git index as`
`1287`	`1287`	`they have not been initialized with a stream.`
`1288`	`1288`	`"""`
	`1289`	`+`
	`1290`	`+# only run if we are the default repository index`
	`1291`	`+ifself._file_path!=self._index_path():`
	`1292`	`+raiseAssertionError(`
	`1293`	`+"Cannot call %r on indices that do not represent the default git index"%self.diff())`
`1289`	`1294`	`# index against index is always empty`
`1290`	`1295`	`ifotherisself.Index:`
`1291`	`1296`	`returngit_diff.DiffIndex()`

Comments

(0)

ページ先頭