saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Replace use of pygit2 deprecated and removed (1.15.0) oid with id

Browse source
This commit is contained in:
David Murphy 2024-07-24 11:13:03 -06:00 • committed by Daniel Wozniak
parent 6b0690e5af
commit 1b66ffc3ac
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
salt/utils/gitfs.py
View file

@ -1803,7 +1803,7 @@ class Pygit2(GitProvider):
# remote ref.
self.repo.checkout(checkout_ref)
if branch:
self.repo.reset(oid, pygit2.GIT_RESET_HARD)
self.repo.reset(pygit2_id, pygit2.GIT_RESET_HARD)
return True
except GitLockError as exc:
if exc.errno == errno.EEXIST:
@ -1832,11 +1832,11 @@ class Pygit2(GitProvider):
tag_ref = "refs/tags/" + tgt_ref
if remote_ref in refs:
# Get commit id for the remote ref
oid = self.peel(self.repo.lookup_reference(remote_ref)).id
pygit2_id = self.peel(self.repo.lookup_reference(remote_ref)).id
if local_ref not in refs:
# No local branch for this remote, so create one and point
# it at the commit id of the remote ref
self.repo.create_reference(local_ref, oid)
self.repo.create_reference(local_ref, pygit2_id)
try:
target_sha = self.peel(self.repo.lookup_reference(remote_ref)).hex
@ -1867,7 +1867,7 @@ class Pygit2(GitProvider):
# cachedir).
head_ref = local_head.target
# If head_ref is not a string, it will point to a
# pygit2.Oid object and we are in detached HEAD mode.
# pygit2.id object and we are in detached HEAD mode.
# Therefore, there is no need to add a local reference. If
# head_ref == local_ref, then the local reference for HEAD
# in refs/heads/ already exists and again, no need to add.
@ -2036,10 +2036,10 @@ class Pygit2(GitProvider):
the empty directories within it in the "blobs" list
"""
for entry in iter(tree):
if entry.oid not in self.repo:
if entry.id not in self.repo:
# Entry is a submodule, skip it
continue
blob = self.repo[entry.oid]
blob = self.repo[entry.id]
if not isinstance(blob, pygit2.Tree):
continue
blobs.append(
@ -2058,8 +2058,8 @@ class Pygit2(GitProvider):
return ret
if self.root(tgt_env):
try:
oid = tree[self.root(tgt_env)].oid
tree = self.repo[oid]
pygit2_id = tree[self.root(tgt_env)].id
tree = self.repo[pygit2_id]
except KeyError:
return ret
if not isinstance(tree, pygit2.Tree):
@ -2179,17 +2179,17 @@ class Pygit2(GitProvider):
the file paths and symlink info in the "blobs" dict
"""
for entry in iter(tree):
if entry.oid not in self.repo:
if entry.id not in self.repo:
# Entry is a submodule, skip it
continue
obj = self.repo[entry.oid]
obj = self.repo[entry.id]
if isinstance(obj, pygit2.Blob):
repo_path = salt.utils.path.join(
prefix, entry.name, use_posixpath=True
)
blobs.setdefault("files", []).append(repo_path)
if stat.S_ISLNK(tree[entry.name].filemode):
link_tgt = self.repo[tree[entry.name].oid].data
link_tgt = self.repo[tree[entry.name].id].data
blobs.setdefault("symlinks", {})[repo_path] = link_tgt
elif isinstance(obj, pygit2.Tree):
_traverse(
@ -2208,8 +2208,8 @@ class Pygit2(GitProvider):
try:
# This might need to be changed to account for a root that
# spans more than one directory
oid = tree[self.root(tgt_env)].oid
tree = self.repo[oid]
pygit2_id = tree[self.root(tgt_env)].id
tree = self.repo[pygit2_id]
except KeyError:
return files, symlinks
if not isinstance(tree, pygit2.Tree):
@ -2262,12 +2262,12 @@ class Pygit2(GitProvider):
# path's object ID will be the target of the symlink. Follow
# the symlink and set path to the location indicated
# in the blob data.
link_tgt = self.repo[entry.oid].data
link_tgt = self.repo[entry.id].data
path = salt.utils.path.join(
os.path.dirname(path), link_tgt, use_posixpath=True
)
else:
blob = self.repo[entry.oid]
blob = self.repo[entry.id]
if isinstance(blob, pygit2.Tree):
# Path is a directory, not a file.
blob = None