android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-01-20 16:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove platform_utils.realpath

Browse Source 
... since it's just a simple wrapper of os.path.realpath now.

Change-Id: I7433e5fe09c64b130f06e2541151dce1961772c9
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/416637
Tested-by: Kaiyi Li <kaiyili@google.com>
Reviewed-by: Greg Edelston <gredelston@google.com>
Commit-Queue: Kaiyi Li <kaiyili@google.com>
This commit is contained in:
Kaiyi Li 2024-03-27 07:21:43 -07:00 committed by LUCI
parent 159389f0da
commit 46819a78a1
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform_utils.py
View File

@ -251,12 +251,3 @@ def readlink(path):
return platform_utils_win32.readlink(_makelongpath(path)) return platform_utils_win32.readlink(_makelongpath(path))
else: else:
return os.readlink(path) return os.readlink(path)
def realpath(path):
"""Return the canonical path of the specified filename, eliminating
any symbolic links encountered in the path.
Availability: Windows, Unix.
"""
return os.path.realpath(path)

28
project.py
View File

@ -145,7 +145,7 @@ def _ProjectHooks():
""" """
global _project_hook_list global _project_hook_list
if _project_hook_list is None: if _project_hook_list is None:
d = platform_utils.realpath(os.path.abspath(os.path.dirname(__file__))) d = os.path.realpath(os.path.abspath(os.path.dirname(__file__)))
d = os.path.join(d, "hooks") d = os.path.join(d, "hooks")
_project_hook_list = [ _project_hook_list = [
os.path.join(d, x) for x in platform_utils.listdir(d) os.path.join(d, x) for x in platform_utils.listdir(d)
@ -1826,7 +1826,7 @@ class Project:
# remove because it will recursively delete projects -- we handle that # remove because it will recursively delete projects -- we handle that
# ourselves below. https://crbug.com/git/48 # ourselves below. https://crbug.com/git/48
if self.use_git_worktrees: if self.use_git_worktrees:
needle = platform_utils.realpath(self.gitdir) needle = os.path.realpath(self.gitdir)
# Find the git worktree commondir under .repo/worktrees/. # Find the git worktree commondir under .repo/worktrees/.
output = self.bare_git.worktree("list", "--porcelain").splitlines()[ output = self.bare_git.worktree("list", "--porcelain").splitlines()[
0 0
@ -1840,7 +1840,7 @@ class Project:
with open(gitdir) as fp: with open(gitdir) as fp:
relpath = fp.read().strip() relpath = fp.read().strip()
# Resolve the checkout path and see if it matches this project. # Resolve the checkout path and see if it matches this project.
fullpath = platform_utils.realpath( fullpath = os.path.realpath(
os.path.join(configs, name, relpath) os.path.join(configs, name, relpath)
) )
if fullpath == needle: if fullpath == needle:
@ -2975,14 +2975,12 @@ class Project:
"Retrying clone after deleting %s", self.gitdir "Retrying clone after deleting %s", self.gitdir
) )
try: try:
platform_utils.rmtree( platform_utils.rmtree(os.path.realpath(self.gitdir))
platform_utils.realpath(self.gitdir)
)
if self.worktree and os.path.exists( if self.worktree and os.path.exists(
platform_utils.realpath(self.worktree) os.path.realpath(self.worktree)
): ):
platform_utils.rmtree( platform_utils.rmtree(
platform_utils.realpath(self.worktree) os.path.realpath(self.worktree)
) )
return self._InitGitDir( return self._InitGitDir(
mirror_git=mirror_git, mirror_git=mirror_git,
@ -3068,7 +3066,7 @@ class Project:
self._InitHooks(quiet=quiet) self._InitHooks(quiet=quiet)
def _InitHooks(self, quiet=False): def _InitHooks(self, quiet=False):
hooks = platform_utils.realpath(os.path.join(self.objdir, "hooks")) hooks = os.path.realpath(os.path.join(self.objdir, "hooks"))
if not os.path.exists(hooks): if not os.path.exists(hooks):
os.makedirs(hooks) os.makedirs(hooks)
@ -3211,9 +3209,9 @@ class Project:
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)
dst = platform_utils.realpath(dst_path) dst = os.path.realpath(dst_path)
if os.path.lexists(dst): if os.path.lexists(dst):
src = platform_utils.realpath(src_path) src = os.path.realpath(src_path)
# Fail if the links are pointing to the wrong place. # Fail if the links are pointing to the wrong place.
if src != dst: if src != dst:
logger.error( logger.error(
@ -3249,10 +3247,10 @@ class Project:
if copy_all: if copy_all:
to_copy = platform_utils.listdir(gitdir) to_copy = platform_utils.listdir(gitdir)
dotgit = platform_utils.realpath(dotgit) dotgit = os.path.realpath(dotgit)
for name in set(to_copy).union(to_symlink): for name in set(to_copy).union(to_symlink):
try: try:
src = platform_utils.realpath(os.path.join(gitdir, name)) src = os.path.realpath(os.path.join(gitdir, name))
dst = os.path.join(dotgit, name) dst = os.path.join(dotgit, name)
if os.path.lexists(dst): if os.path.lexists(dst):
@ -3349,9 +3347,7 @@ class Project:
else: else:
if not init_dotgit: if not init_dotgit:
# See if the project has changed. # See if the project has changed.
if platform_utils.realpath( if os.path.realpath(self.gitdir) != os.path.realpath(dotgit):
self.gitdir
) != platform_utils.realpath(dotgit):
platform_utils.remove(dotgit) platform_utils.remove(dotgit)
if init_dotgit or not os.path.exists(dotgit): if init_dotgit or not os.path.exists(dotgit):