android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

project: drop support for symlinking internal .git files

Browse Source 
Since we don't do this anymore, and there prob won't be a need to
bring it back, drop support for it.

Bug: https://crbug.com/gerrit/15460
Change-Id: I7d86706f108c797a5c7962cb1578693d49430367
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/327537
Reviewed-by: Jack Neus <jackneus@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger 2021-12-20 18:16:33 -05:00
parent 89ed8acdbe
commit d33dce0b77
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
project.py
View File

@ -457,7 +457,6 @@ class RemoteSpec(object):
class Project(object): class Project(object):
# These objects can be shared between several working trees. # These objects can be shared between several working trees.
shareable_files = []
shareable_dirs = ['hooks', 'objects', 'rr-cache'] shareable_dirs = ['hooks', 'objects', 'rr-cache']
def __init__(self, def __init__(self,
@ -2651,10 +2650,7 @@ class Project(object):
if self.use_git_worktrees: if self.use_git_worktrees:
return return
symlink_files = self.shareable_files[:] for name in self.shareable_dirs:
symlink_dirs = self.shareable_dirs[:]
to_symlink = symlink_files + symlink_dirs
for name in set(to_symlink):
# Try to self-heal a bit in simple cases. # Try to self-heal a bit in simple cases.
dst_path = os.path.join(destdir, name) dst_path = os.path.join(destdir, name)
src_path = os.path.join(srcdir, name) src_path = os.path.join(srcdir, name)
@ -2680,9 +2676,8 @@ class Project(object):
copy_all: If true, copy all remaining files from |gitdir| -> |dotgit|. copy_all: If true, copy all remaining files from |gitdir| -> |dotgit|.
This saves you the effort of initializing |dotgit| yourself. This saves you the effort of initializing |dotgit| yourself.
""" """
symlink_files = self.shareable_files[:]
symlink_dirs = self.shareable_dirs[:] symlink_dirs = self.shareable_dirs[:]
to_symlink = symlink_files + symlink_dirs to_symlink = symlink_dirs
to_copy = [] to_copy = []
if copy_all: if copy_all:
@ -2710,11 +2705,6 @@ class Project(object):
elif os.path.isfile(src): elif os.path.isfile(src):
shutil.copy(src, dst) shutil.copy(src, dst)
# If the source file doesn't exist, ensure the destination
# file doesn't either.
if name in symlink_files and not os.path.lexists(src):
platform_utils.remove(dst, missing_ok=True)
except OSError as e: except OSError as e:
if e.errno == errno.EPERM: if e.errno == errno.EPERM:
raise DownloadError(self._get_symlink_error_message()) raise DownloadError(self._get_symlink_error_message())