Merge pull request #654 from vathpela/worktrees

worktrees: make non-packed refs also work correctly.

Author: Byron

git/refs/remote.py

@@ -36,6 +36,10 @@ def delete(cls, repo, *refs, **kwargs):
 # are generally ignored in the refs/ folder. We don't though
 # and delete remainders manually
 forrefinrefs:
+try:
+os.remove(osp.join(repo.common_dir, ref.path))
+exceptOSError:
+pass
 try:
 os.remove(osp.join(repo.git_dir, ref.path))
 exceptOSError:

git/refs/symbolic.py

@@ -26,6 +26,14 @@
 __all__= ["SymbolicReference"]
 
 
+def_git_dir(repo, path):
+""" Find the git dir that's appropriate for the path"""
+name="%s"% (path,)
+ifnamein ['HEAD', 'ORIG_HEAD', 'FETCH_HEAD', 'index', 'logs']:
+returnrepo.git_dir
+returnrepo.common_dir
+
+
 classSymbolicReference(object):
 
 """Represents a special case of a reference such that this reference is symbolic.
@@ -71,16 +79,11 @@ def name(self):
 
 @property
 defabspath(self):
-returnjoin_path_native(self.repo.git_dir, self.path)
+returnjoin_path_native(_git_dir(self.repo, self.path), self.path)
 
 @classmethod
 def_get_packed_refs_path(cls, repo):
-try:
-commondir=open(osp.join(repo.git_dir, 'commondir'), 'rt').readlines()[0].strip()
-except (OSError, IOError):
-commondir='.'
-repodir=osp.join(repo.git_dir, commondir)
-returnosp.join(repodir, 'packed-refs')
+returnosp.join(repo.common_dir, 'packed-refs')
 
 @classmethod
 def_iter_packed_refs(cls, repo):
@@ -127,11 +130,12 @@ def dereference_recursive(cls, repo, ref_path):
 # END recursive dereferencing
 
 @classmethod
-def_get_ref_info_helper(cls, repo, repodir, ref_path):
+def_get_ref_info_helper(cls, repo, ref_path):
 """Return: (str(sha), str(target_ref_path)) if available, the sha the file at
  rela_path points to, or None. target_ref_path is the reference we
  point to, or None"""
 tokens=None
+repodir=_git_dir(repo, ref_path)
 try:
 withopen(osp.join(repodir, ref_path), 'rt') asfp:
 value=fp.read().rstrip()
@@ -169,16 +173,7 @@ def _get_ref_info(cls, repo, ref_path):
 """Return: (str(sha), str(target_ref_path)) if available, the sha the file at
  rela_path points to, or None. target_ref_path is the reference we
  point to, or None"""
-try:
-returncls._get_ref_info_helper(repo, repo.git_dir, ref_path)
-exceptValueError:
-try:
-commondir=open(osp.join(repo.git_dir, 'commondir'), 'rt').readlines()[0].strip()
-except (OSError, IOError):
-commondir='.'
-
-repodir=osp.join(repo.git_dir, commondir)
-returncls._get_ref_info_helper(repo, repodir, ref_path)
+returncls._get_ref_info_helper(repo, ref_path)
 
 def_get_object(self):
 """
@@ -433,7 +428,7 @@ def delete(cls, repo, path):
  or just "myreference", hence 'refs/' is implied.
  Alternatively the symbolic reference to be deleted"""
 full_ref_path=cls.to_full_path(path)
-abs_path=osp.join(repo.git_dir, full_ref_path)
+abs_path=osp.join(repo.common_dir, full_ref_path)
 ifosp.exists(abs_path):
 os.remove(abs_path)
 else:
@@ -484,8 +479,9 @@ def _create(cls, repo, path, resolve, reference, force, logmsg=None):
  a proper symbolic reference. Otherwise it will be resolved to the
  corresponding object and a detached symbolic reference will be created
  instead"""
+git_dir=_git_dir(repo, path)
 full_ref_path=cls.to_full_path(path)
-abs_ref_path=osp.join(repo.git_dir, full_ref_path)
+abs_ref_path=osp.join(git_dir, full_ref_path)
 
 # figure out target data
 target=reference
@@ -559,8 +555,8 @@ def rename(self, new_path, force=False):
 ifself.path==new_path:
 returnself
 
-new_abs_path=osp.join(self.repo.git_dir, new_path)
-cur_abs_path=osp.join(self.repo.git_dir, self.path)
+new_abs_path=osp.join(_git_dir(self.repo, new_path), new_path)
+cur_abs_path=osp.join(_git_dir(self.repo, self.path), self.path)
 ifosp.isfile(new_abs_path):
 ifnotforce:
 # if they point to the same file, its not an error
@@ -594,7 +590,7 @@ def _iter_items(cls, repo, common_path=None):
 
 # walk loose refs
 # Currently we do not follow links
-forroot, dirs, filesinos.walk(join_path_native(repo.git_dir, common_path)):
+forroot, dirs, filesinos.walk(join_path_native(repo.common_dir, common_path)):
 if'refs'notinroot.split(os.sep): # skip non-refs subfolders
 refs_id= [dfordindirsifd=='refs']
 ifrefs_id:
@@ -605,7 +601,7 @@ def _iter_items(cls, repo, common_path=None):
 iff=='packed-refs':
 continue
 abs_path=to_native_path_linux(join_path(root, f))
-rela_paths.add(abs_path.replace(to_native_path_linux(repo.git_dir) +'/', ""))
+rela_paths.add(abs_path.replace(to_native_path_linux(repo.common_dir) +'/', ""))
 # END for each file in root directory
 # END for each directory to walk
 

git/remote.py

@@ -653,7 +653,7 @@ def _get_fetch_info_from_stderr(self, proc, progress):
 continue
 
 # read head information
-withopen(osp.join(self.repo.git_dir, 'FETCH_HEAD'), 'rb') asfp:
+withopen(osp.join(self.repo.common_dir, 'FETCH_HEAD'), 'rb') asfp:
 fetch_head_info= [l.decode(defenc) forlinfp.readlines()]
 
 l_fil=len(fetch_info_lines)

git/repo/base.py

@@ -71,6 +71,7 @@ class Repo(object):
 working_dir=None
 _working_tree_dir=None
 git_dir=None
+_common_dir=None
 
 # precompiled regex
 re_whitespace=re.compile(r'\s+')
@@ -172,17 +173,23 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
 # lets not assume the option exists, although it should
 pass
 
+try:
+common_dir=open(osp.join(self.git_dir, 'commondir'), 'rt').readlines()[0].strip()
+self._common_dir=osp.join(self.git_dir, common_dir)
+except (OSError, IOError):
+self._common_dir=None
+
 # adjust the wd in case we are actually bare - we didn't know that
 # in the first place
 ifself._bare:
 self._working_tree_dir=None
 # END working dir handling
 
-self.working_dir=self._working_tree_dirorself.git_dir
+self.working_dir=self._working_tree_dirorself.common_dir
 self.git=self.GitCommandWrapperType(self.working_dir)
 
 # special handling, in special times
-args= [osp.join(self.git_dir, 'objects')]
+args= [osp.join(self.common_dir, 'objects')]
 ifissubclass(odbt, GitCmdObjectDB):
 args.append(self.git)
 self.odb=odbt(*args)
@@ -239,6 +246,13 @@ def working_tree_dir(self):
  """
 returnself._working_tree_dir
 
+@property
+defcommon_dir(self):
+""":return: The git dir that holds everything except possibly HEAD,
+ FETCH_HEAD, ORIG_HEAD, COMMIT_EDITMSG, index, and logs/ .
+ """
+returnself._common_dirorself.git_dir
+
 @property
 defbare(self):
 """:return: True if the repository is bare"""
@@ -577,7 +591,7 @@ def _set_alternates(self, alts):
  :note:
  The method does not check for the existence of the paths in alts
  as the caller is responsible."""
-alternates_path=osp.join(self.git_dir, 'objects', 'info', 'alternates')
+alternates_path=osp.join(self.common_dir, 'objects', 'info', 'alternates')
 ifnotalts:
 ifosp.isfile(alternates_path):
 os.remove(alternates_path)
@@ -940,7 +954,7 @@ def clone(self, path, progress=None, **kwargs):
  * All remaining keyword arguments are given to the git-clone command
 
  :return: ``git.Repo`` (the newly cloned repo)"""
-returnself._clone(self.git, self.git_dir, path, type(self.odb), progress, **kwargs)
+returnself._clone(self.git, self.common_dir, path, type(self.odb), progress, **kwargs)
 
 @classmethod
 defclone_from(cls, url, to_path, progress=None, env=None, **kwargs):

git/test/test_repo.py

@@ -935,6 +935,8 @@ def test_git_work_tree_dotgit(self, rw_dir):
 commit=repo.head.commit
 self.assertIsInstance(commit, Object)
 
+self.assertIsInstance(repo.heads['aaaaaaaa'], Head)
+
 @with_rw_directory
 deftest_git_work_tree_env(self, rw_dir):
 """Check that we yield to GIT_WORK_TREE"""