Commit3bb63f3

committed

Condense FetchInfo.refresh using contextlib.suppress

I think this refactoring slightly improves readability.+ Condense/sort/group imports (while adding contextlib import).+ Minor style tweaks in FetchInfo.refresh comments.+ Make a comment in Git.refresh clearer, building on revisions in:#1810 (comment)

1 parentae28c98 commit3bb63f3Copy full SHA for 3bb63f3

File tree

2 files changed

+12

-23

lines changed

git
- cmd.py
- remote.py

2 files changed

+12

-23

lines changed

`‎git/cmd.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ def refresh(cls, path: Union[None, PathLike] = None) -> bool:`
`478`	`478`	`# We get here if this was the initial refresh and the refresh mode was`
`479`	`479`	`# not error. Go ahead and set the GIT_PYTHON_GIT_EXECUTABLE such that we`
`480`	`480`	`# discern the difference between the first refresh at import time`
`481`		`-# and subsequent calls to refresh().`
	`481`	`+# and subsequent calls togit.refresh or this refresh method.`
`482`	`482`	`cls.GIT_PYTHON_GIT_EXECUTABLE=cls.git_exec_name`
`483`	`483`	`else:`
`484`	`484`	`# After the first refresh (when GIT_PYTHON_GIT_EXECUTABLE is no longer`

`‎git/remote.py`

Lines changed: 11 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,30 +5,24 @@`
`5`	`5`
`6`	`6`	`"""Module implementing a remote object allowing easy access to git remotes."""`
`7`	`7`
	`8`	`+importcontextlib`
`8`	`9`	`importlogging`
`9`	`10`	`importre`
`10`	`11`
`11`		`-fromgit.cmdimporthandle_process_output,Git`
	`12`	`+fromgit.cmdimportGit,handle_process_output`
`12`	`13`	`fromgit.compatimportdefenc,force_text`
	`14`	`+fromgit.configimportGitConfigParser,SectionConstraint,cp`
`13`	`15`	`fromgit.excimportGitCommandError`
	`16`	`+fromgit.refsimportHead,Reference,RemoteReference,SymbolicReference,TagReference`
`14`	`17`	`fromgit.utilimport (`
`15`		`-LazyMixin,`
`16`		`-IterableObj,`
	`18`	`+CallableRemoteProgress,`
`17`	`19`	`IterableList,`
	`20`	`+IterableObj,`
	`21`	`+LazyMixin,`
`18`	`22`	`RemoteProgress,`
`19`		`-CallableRemoteProgress,`
`20`		`-)`
`21`		`-fromgit.utilimport (`
`22`	`23`	`join_path,`
`23`	`24`	`)`
`24`	`25`
`25`		`-fromgit.configimport (`
`26`		`-GitConfigParser,`
`27`		`-SectionConstraint,`
`28`		`-cp,`
`29`		`-)`
`30`		`-fromgit.refsimportHead,Reference,RemoteReference,SymbolicReference,TagReference`
`31`		`-`
`32`	`26`	`# typing-------------------------------------------------------`
`33`	`27`
`34`	`28`	`fromtypingimport (`
`@@ -345,18 +339,13 @@ class FetchInfo(IterableObj):`
`345`	`339`	`@classmethod`
`346`	`340`	`defrefresh(cls)->Literal[True]:`
`347`	`341`	`"""This gets called by the refresh function (see the top level __init__)."""`
`348`		`-#clear the old values in _flag_map`
`349`		`-try:`
	`342`	`+#Clear the old values in _flag_map.`
	`343`	`+withcontextlib.suppress(KeyError):`
`350`	`344`	`delcls._flag_map["t"]`
`351`		`-exceptKeyError:`
`352`		`-pass`
`353`		`-`
`354`		`-try:`
	`345`	`+withcontextlib.suppress(KeyError):`
`355`	`346`	`delcls._flag_map["-"]`
`356`		`-exceptKeyError:`
`357`		`-pass`
`358`	`347`
`359`		`-#set the value given the git version`
	`348`	`+#Set the value given the git version.`
`360`	`349`	`ifGit().version_info[:2]>= (2,10):`
`361`	`350`	`cls._flag_map["t"]=cls.TAG_UPDATE`
`362`	`351`	`else:`

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!

Commit3bb63f3

File tree

2 files changed

2 files changed

`‎git/cmd.py`

`‎git/remote.py`

0 commit comments