repo: minor code and doc correcions.

+ Expansion of paths also `osp.normalize()` them. + Make Repo-fields --> class-fields to avoid initializations on construct. + Explain and rename `git.repo.fun.find_git_dir()` is for submodules (`find_submodule_git_dir()`).

Author: ankostis

git/repo/base.py

@@ -47,7 +47,7 @@
 from .funimport (
 rev_parse,
 is_git_dir,
-find_git_dir,
+find_submodule_git_dir,
 touch,
 )
 fromgit.compatimport (
@@ -79,7 +79,7 @@
 
 
 def_expand_path(p):
-returnos.path.abspath(os.path.expandvars(os.path.expanduser(p)))
+returnos.path.normpath(os.path.abspath(os.path.expandvars(os.path.expanduser(p))))
 
 
 classRepo(object):
@@ -98,6 +98,11 @@ class Repo(object):
  'git_dir' is the .git repository directory, which is always set."""
 DAEMON_EXPORT_FILE='git-daemon-export-ok'
 
+git=None# Must exist, or __del__ will fail in case we raise on `__init__()`
+working_dir=None
+_working_tree_dir=None
+git_dir=None
+
 # precompiled regex
 re_whitespace=re.compile(r'\s+')
 re_hexsha_only=re.compile('^[0-9A-Fa-f]{40}$')
@@ -138,16 +143,11 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
  :raise InvalidGitRepositoryError:
  :raise NoSuchPathError:
  :return: git.Repo """
-self.git=None# should be set for __del__ not to fail in case we raise
 epath=os.getenv('GIT_DIR')
 epath=_expand_path(epathorpathoros.getcwd())
 ifnotos.path.exists(epath):
 raiseNoSuchPathError(epath)
 
-self.working_dir=None
-self._working_tree_dir=None
-self.git_dir=None
-
 ## Walk up the path to find the `.git` dir.
 #
 curpath=epath
@@ -157,20 +157,20 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
 # 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=os.path.normpath(curpath)
+self.git_dir=curpath
 self._working_tree_dir=os.path.dirname(self.git_dir)
 break
 
-gitpath=find_git_dir(join(curpath, '.git'))
-ifgitpathisnotNone:
-self.git_dir=os.path.normpath(gitpath)
+sm_gitpath=find_submodule_git_dir(join(curpath, '.git'))
+ifsm_gitpathisnotNone:
+self.git_dir=os.path.normpath(sm_gitpath)
 self._working_tree_dir=curpath
 break
 
 ifnotsearch_parent_directories:
 break
-curpath, dummy=os.path.split(curpath)
-ifnotdummy:
+curpath, tail=os.path.split(curpath)
+ifnottail:
 break
 # END while curpath
 

git/repo/fun.py

@@ -20,7 +20,7 @@
 fromgit.compatimportxrange
 
 
-__all__= ('rev_parse', 'is_git_dir', 'touch', 'find_git_dir', 'name_to_object', 'short_to_long', 'deref_tag',
+__all__= ('rev_parse', 'is_git_dir', 'touch', 'find_submodule_git_dir', 'name_to_object', 'short_to_long', 'deref_tag',
 'to_commit')
 
 
@@ -49,7 +49,8 @@ def is_git_dir(d):
 returnFalse
 
 
-deffind_git_dir(d):
+deffind_submodule_git_dir(d):
+"""Search for a submodule repo."""
 ifis_git_dir(d):
 returnd
 
@@ -64,7 +65,7 @@ def find_git_dir(d):
 path=content[8:]
 ifnotos.path.isabs(path):
 path=join(dirname(d), path)
-returnfind_git_dir(path)
+returnfind_submodule_git_dir(path)
 # end handle exception
 returnNone
 

git/test/test_submodule.py

@@ -14,7 +14,7 @@
 fromgit.objects.submodule.baseimportSubmodule
 fromgit.objects.submodule.rootimportRootModule, RootUpdateProgress
 fromgit.repo.funimport (
-find_git_dir,
+find_submodule_git_dir,
 touch
 )
 fromgit.test.libimport (
@@ -757,7 +757,7 @@ def assert_exists(sm, value=True):
 else:
 assertosp.isfile(module_repo_path)
 assertsm.module().has_separate_working_tree()
-assertfind_git_dir(module_repo_path) isnotNone, "module pointed to by .git file must be valid"
+assertfind_submodule_git_dir(module_repo_path) isnotNone, "module pointed to by .git file must be valid"
 # end verify submodule 'style'
 
 # test move