Commit737ec27

committed

Remove optional from two member variables

1 parent63a60b3 commit737ec27Copy full SHA for 737ec27

File tree

1 file changed

+14

-20

lines changed

git/repo
- base.py

1 file changed

+14

-20

lines changed

`‎git/repo/base.py`

Lines changed: 14 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,9 @@ class Repo(object):`
`123`	`123`	`DAEMON_EXPORT_FILE="git-daemon-export-ok"`
`124`	`124`
`125`	`125`	git=cast("Git",None)# Must exist, or __del__ will fail in case we raise on `__init__()`
`126`		`-working_dir:Optional[PathLike]=None`
	`126`	`+working_dir:PathLike`
`127`	`127`	`_working_tree_dir:Optional[PathLike]=None`
`128`		`-git_dir:PathLike=""`
	`128`	`+git_dir:PathLike`
`129`	`129`	`_common_dir:PathLike=""`
`130`	`130`
`131`	`131`	`# precompiled regex`
`@@ -215,13 +215,14 @@ def __init__(`
`215`	`215`	## Walk up the path to find the `.git` dir.
`216`	`216`	`#`
`217`	`217`	`curpath=epath`
	`218`	`+_git_dir=None`
`218`	`219`	`whilecurpath:`
`219`	`220`	`# ABOUT osp.NORMPATH`
`220`	`221`	`# It's important to normalize the paths, as submodules will otherwise initialize their`
`221`	`222`	`# repo instances with paths that depend on path-portions that will not exist after being`
`222`	`223`	`# removed. It's just cleaner.`
`223`	`224`	`ifis_git_dir(curpath):`
`224`		`-self.git_dir=curpath`
	`225`	`+_git_dir=curpath`
`225`	`226`	`# from man git-config : core.worktree`
`226`	`227`	`# Set the path to the root of the working tree. If GIT_COMMON_DIR environment`
`227`	`228`	`# variable is set, core.worktree is ignored and not used for determining the`
`@@ -230,7 +231,7 @@ def __init__(`
`230`	`231`	`# directory, which is either specified by GIT_DIR, or automatically discovered.`
`231`	`232`	`# If GIT_DIR is specified but none of GIT_WORK_TREE and core.worktree is specified,`
`232`	`233`	`# the current working directory is regarded as the top level of your working tree.`
`233`		`-self._working_tree_dir=os.path.dirname(self.git_dir)`
	`234`	`+self._working_tree_dir=os.path.dirname(_git_dir)`
`234`	`235`	`ifos.environ.get("GIT_COMMON_DIR")isNone:`
`235`	`236`	`gitconf=self.config_reader("repository")`
`236`	`237`	`ifgitconf.has_option("core","worktree"):`
`@@ -242,14 +243,14 @@ def __init__(`
`242`	`243`	`dotgit=osp.join(curpath,".git")`
`243`	`244`	`sm_gitpath=find_submodule_git_dir(dotgit)`
`244`	`245`	`ifsm_gitpathisnotNone:`
`245`		`-self.git_dir=osp.normpath(sm_gitpath)`
	`246`	`+_git_dir=osp.normpath(sm_gitpath)`
`246`	`247`
`247`	`248`	`sm_gitpath=find_submodule_git_dir(dotgit)`
`248`	`249`	`ifsm_gitpathisNone:`
`249`	`250`	`sm_gitpath=find_worktree_git_dir(dotgit)`
`250`	`251`
`251`	`252`	`ifsm_gitpathisnotNone:`
`252`		`-self.git_dir=expand_path(sm_gitpath,expand_vars)`
	`253`	`+_git_dir=expand_path(sm_gitpath,expand_vars)`
`253`	`254`	`self._working_tree_dir=curpath`
`254`	`255`	`break`
`255`	`256`
`@@ -260,8 +261,9 @@ def __init__(`
`260`	`261`	`break`
`261`	`262`	`# END while curpath`
`262`	`263`
`263`		`-ifself.git_dirisNone:`
	`264`	`+if_git_dirisNone:`
`264`	`265`	`raiseInvalidGitRepositoryError(epath)`
	`266`	`+self.git_dir=_git_dir`
`265`	`267`
`266`	`268`	`self._bare=False`
`267`	`269`	`try:`
`@@ -282,7 +284,7 @@ def __init__(`
`282`	`284`	`self._working_tree_dir=None`
`283`	`285`	`# END working dir handling`
`284`	`286`
`285`		`-self.working_dir:Optional[PathLike]=self._working_tree_dirorself.common_dir`
	`287`	`+self.working_dir:PathLike=self._working_tree_dirorself.common_dir`
`286`	`288`	`self.git=self.GitCommandWrapperType(self.working_dir)`
`287`	`289`
`288`	`290`	`# special handling, in special times`
`@@ -320,7 +322,7 @@ def close(self) -> None:`
`320`	`322`	`gc.collect()`
`321`	`323`
`322`	`324`	`def__eq__(self,rhs:object)->bool:`
`323`		`-ifisinstance(rhs,Repo)andself.git_dir:`
	`325`	`+ifisinstance(rhs,Repo):`
`324`	`326`	`returnself.git_dir==rhs.git_dir`
`325`	`327`	`returnFalse`
`326`	`328`
`@@ -332,14 +334,12 @@ def __hash__(self) -> int:`
`332`	`334`
`333`	`335`	`# Description property`
`334`	`336`	`def_get_description(self)->str:`
`335`		`-ifself.git_dir:`
`336`		`-filename=osp.join(self.git_dir,"description")`
	`337`	`+filename=osp.join(self.git_dir,"description")`
`337`	`338`	`withopen(filename,"rb")asfp:`
`338`	`339`	`returnfp.read().rstrip().decode(defenc)`
`339`	`340`
`340`	`341`	`def_set_description(self,descr:str)->None:`
`341`		`-ifself.git_dir:`
`342`		`-filename=osp.join(self.git_dir,"description")`
	`342`	`+filename=osp.join(self.git_dir,"description")`
`343`	`343`	`withopen(filename,"wb")asfp:`
`344`	`344`	`fp.write((descr+"\n").encode(defenc))`
`345`	`345`
`@@ -357,13 +357,7 @@ def common_dir(self) -> PathLike:`
`357`	`357`	`"""`
`358`	`358`	`:return: The git dir that holds everything except possibly HEAD,`
`359`	`359`	`FETCH_HEAD, ORIG_HEAD, COMMIT_EDITMSG, index, and logs/."""`
`360`		`-ifself._common_dir:`
`361`		`-returnself._common_dir`
`362`		`-elifself.git_dir:`
`363`		`-returnself.git_dir`
`364`		`-else:`
`365`		`-# or could return ""`
`366`		`-raiseInvalidGitRepositoryError()`
	`360`	`+returnself._common_dirorself.git_dir`
`367`	`361`
`368`	`362`	`@property`
`369`	`363`	`defbare(self)->bool:`

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!

Commit737ec27

File tree

1 file changed

1 file changed

`‎git/repo/base.py`

0 commit comments