Commitb4b6e1e

committed

Fix IndexFile.commitparent_commits annotation

This changes that parameter's annotation to be equivalent to theannotation of the corresponding Commit.create_from_tree parameter.It had been annotated as the old Commit_ish type, but it passesthat argument to Commit.create_from_tree, and it also refers tothat method in its docstring for usage. Commit.create_from_treeannotates this argument as an optional list of Commit objects, andif the objects obtained when it iterates them are not Commitinstances, then an exception is raised. Even if being able to passother commit-ish things (or references, strings, etc.) isdesirable, that does not currently work.This also improves sorting (and grouping style) of imports in thatfile (which were being changed already to no longer import the oldCommit_ish type).

1 parentab27827 commitb4b6e1eCopy full SHA for b4b6e1e

File tree

1 file changed

+15

-28

lines changed

git/index
- base.py

1 file changed

+15

-28

lines changed

`‎git/index/base.py`

Lines changed: 15 additions & 28 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,23 +11,16 @@`
`11`	`11`	`importglob`
`12`	`12`	`fromioimportBytesIO`
`13`	`13`	`importos`
	`14`	`+importos.pathasosp`
`14`	`15`	`fromstatimportS_ISLNK`
`15`	`16`	`importsubprocess`
`16`	`17`	`importsys`
`17`	`18`	`importtempfile`
`18`	`19`
`19`		`-fromgit.compatimport (`
`20`		`-force_bytes,`
`21`		`-defenc,`
`22`		`-)`
`23`		`-fromgit.excimportGitCommandError,CheckoutError,GitError,InvalidGitRepositoryError`
`24`		`-fromgit.objectsimport (`
`25`		`-Blob,`
`26`		`-Submodule,`
`27`		`-Tree,`
`28`		`-Object,`
`29`		`-Commit,`
`30`		`-)`
	`20`	`+fromgit.compatimportdefenc,force_bytes`
	`21`	`+importgit.diffasgit_diff`
	`22`	`+fromgit.excimportCheckoutError,GitCommandError,GitError,InvalidGitRepositoryError`
	`23`	`+fromgit.objectsimportBlob,Commit,Object,Submodule,Tree`
`31`	`24`	`fromgit.objects.utilimportSerializable`
`32`	`25`	`fromgit.utilimport (`
`33`	`26`	`LazyMixin,`
`@@ -41,24 +34,17 @@`
`41`	`34`	`fromgitdb.baseimportIStream`
`42`	`35`	`fromgitdb.dbimportMemoryDB`
`43`	`36`
`44`		`-importgit.diffasgit_diff`
`45`		`-importos.pathasosp`
`46`		`-`
`47`	`37`	`from .funimport (`
	`38`	`+S_IFGITLINK,`
	`39`	`+aggressive_tree_merge,`
`48`	`40`	`entry_key,`
`49`		`-write_cache,`
`50`	`41`	`read_cache,`
`51`		`-aggressive_tree_merge,`
`52`		`-write_tree_from_cache,`
`53`		`-stat_mode_to_index_mode,`
`54`		`-S_IFGITLINK,`
`55`	`42`	`run_commit_hook,`
	`43`	`+stat_mode_to_index_mode,`
	`44`	`+write_cache,`
	`45`	`+write_tree_from_cache,`
`56`	`46`	`)`
`57`		`-from .typimport (`
`58`		`-BaseIndexEntry,`
`59`		`-IndexEntry,`
`60`		`-StageType,`
`61`		`-)`
	`47`	`+from .typimportBaseIndexEntry,IndexEntry,StageType`
`62`	`48`	`from .utilimportTemporaryFileSwap,post_clear_cache,default_index,git_working_dir`
`63`	`49`
`64`	`50`	`# typing -----------------------------------------------------------------------------`
`@@ -80,12 +66,13 @@`
`80`	`66`	`Union,`
`81`	`67`	`)`
`82`	`68`
`83`		`-fromgit.typesimportOld_commit_ish,Literal,PathLike`
	`69`	`+fromgit.typesimportLiteral,PathLike`
`84`	`70`
`85`	`71`	`ifTYPE_CHECKING:`
`86`	`72`	`fromsubprocessimportPopen`
`87`		`-fromgit.repoimportRepo`
	`73`	`+`
`88`	`74`	`fromgit.refs.referenceimportReference`
	`75`	`+fromgit.repoimportRepo`
`89`	`76`	`fromgit.utilimportActor`
`90`	`77`
`91`	`78`
`@@ -1127,7 +1114,7 @@ def move(`
`1127`	`1114`	`defcommit(`
`1128`	`1115`	`self,`
`1129`	`1116`	`message:str,`
`1130`		`-parent_commits:Union[Old_commit_ish,None]=None,`
	`1117`	`+parent_commits:Union[List[Commit],None]=None,`
`1131`	`1118`	`head:bool=True,`
`1132`	`1119`	`author:Union[None,"Actor"]=None,`
`1133`	`1120`	`committer:Union[None,"Actor"]=None,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitb4b6e1e

File tree

1 file changed

1 file changed

`‎git/index/base.py`

0 commit comments