Remove optional from two member variables

Author: Sineaggi

git/repo/base.py

@@ -123,9 +123,9 @@ class Repo(object):
 DAEMON_EXPORT_FILE="git-daemon-export-ok"
 
 git=cast("Git", None) # Must exist, or __del__ will fail in case we raise on `__init__()`
-working_dir: Optional[PathLike] =None
+working_dir: PathLike
 _working_tree_dir: Optional[PathLike] =None
-git_dir: PathLike=""
+git_dir: PathLike
 _common_dir: PathLike=""
 
 # precompiled regex
@@ -215,13 +215,14 @@ def __init__(
 ## Walk up the path to find the `.git` dir.
 #
 curpath=epath
+_git_dir=None
 whilecurpath:
 # ABOUT osp.NORMPATH
 # It's important to normalize the paths, as submodules will otherwise initialize their
 # repo instances with paths that depend on path-portions that will not exist after being
 # removed. It's just cleaner.
 ifis_git_dir(curpath):
-self.git_dir=curpath
+_git_dir=curpath
 # from man git-config : core.worktree
 # Set the path to the root of the working tree. If GIT_COMMON_DIR environment
 # variable is set, core.worktree is ignored and not used for determining the
@@ -230,7 +231,7 @@ def __init__(
 # directory, which is either specified by GIT_DIR, or automatically discovered.
 # If GIT_DIR is specified but none of GIT_WORK_TREE and core.worktree is specified,
 # the current working directory is regarded as the top level of your working tree.
-self._working_tree_dir=os.path.dirname(self.git_dir)
+self._working_tree_dir=os.path.dirname(_git_dir)
 ifos.environ.get("GIT_COMMON_DIR") isNone:
 gitconf=self.config_reader("repository")
 ifgitconf.has_option("core", "worktree"):
@@ -242,14 +243,14 @@ def __init__(
 dotgit=osp.join(curpath, ".git")
 sm_gitpath=find_submodule_git_dir(dotgit)
 ifsm_gitpathisnotNone:
-self.git_dir=osp.normpath(sm_gitpath)
+_git_dir=osp.normpath(sm_gitpath)
 
 sm_gitpath=find_submodule_git_dir(dotgit)
 ifsm_gitpathisNone:
 sm_gitpath=find_worktree_git_dir(dotgit)
 
 ifsm_gitpathisnotNone:
-self.git_dir=expand_path(sm_gitpath, expand_vars)
+_git_dir=expand_path(sm_gitpath, expand_vars)
 self._working_tree_dir=curpath
 break
 
@@ -260,8 +261,9 @@ def __init__(
 break
 # END while curpath
 
-ifself.git_dirisNone:
+if_git_dirisNone:
 raiseInvalidGitRepositoryError(epath)
+self.git_dir=_git_dir
 
 self._bare=False
 try:
@@ -282,7 +284,7 @@ def __init__(
 self._working_tree_dir=None
 # END working dir handling
 
-self.working_dir: Optional[PathLike]=self._working_tree_dirorself.common_dir
+self.working_dir: PathLike=self._working_tree_dirorself.common_dir
 self.git=self.GitCommandWrapperType(self.working_dir)
 
 # special handling, in special times
@@ -320,7 +322,7 @@ def close(self) -> None:
 gc.collect()
 
 def__eq__(self, rhs: object) ->bool:
-ifisinstance(rhs, Repo)andself.git_dir:
+ifisinstance(rhs, Repo):
 returnself.git_dir==rhs.git_dir
 returnFalse
 
@@ -332,14 +334,12 @@ def __hash__(self) -> int:
 
 # Description property
 def_get_description(self) ->str:
-ifself.git_dir:
-filename=osp.join(self.git_dir, "description")
+filename=osp.join(self.git_dir, "description")
 withopen(filename, "rb") asfp:
 returnfp.read().rstrip().decode(defenc)
 
 def_set_description(self, descr: str) ->None:
-ifself.git_dir:
-filename=osp.join(self.git_dir, "description")
+filename=osp.join(self.git_dir, "description")
 withopen(filename, "wb") asfp:
 fp.write((descr+"\n").encode(defenc))
 
@@ -357,13 +357,7 @@ def common_dir(self) -> PathLike:
 """
  :return: The git dir that holds everything except possibly HEAD,
  FETCH_HEAD, ORIG_HEAD, COMMIT_EDITMSG, index, and logs/."""
-ifself._common_dir:
-returnself._common_dir
-elifself.git_dir:
-returnself.git_dir
-else:
-# or could return ""
-raiseInvalidGitRepositoryError()
+returnself._common_dirorself.git_dir
 
 @property
 defbare(self) ->bool: