Skip to content

get_ref: Fix annotated tags #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 22, 2021
Merged

get_ref: Fix annotated tags #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3113ae3
dulwich: Use `get_peeled` for Tags
daavoo Dec 9, 2021
010d495
pygit2: Use `peel` for annotted tags in `get_ref`.
daavoo Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions scmrepo/git/backend/dulwich/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ def set_ref(
raise SCMError(f"Failed to set '{name}'")

def get_ref(self, name, follow: bool = True) -> Optional[str]:
from dulwich.objects import Tag
from dulwich.refs import parse_symref_value

name_b = os.fsencode(name)
Expand All @@ -350,6 +351,8 @@ def get_ref(self, name, follow: bool = True) -> Optional[str]:
except ValueError:
pass
if ref:
if ref in self.repo and isinstance(self.repo[ref], Tag):
ref = self.repo.get_peeled(name_b)
return os.fsdecode(ref)
return None

Expand Down
9 changes: 8 additions & 1 deletion scmrepo/git/backend/pygit2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,20 @@ def set_ref(
)

def get_ref(self, name, follow: bool = True) -> Optional[str]:
from pygit2 import GIT_REF_SYMBOLIC
from pygit2 import GIT_OBJ_COMMIT, GIT_REF_SYMBOLIC, Tag

ref = self.repo.references.get(name)
if not ref:
return None
if follow and ref.type == GIT_REF_SYMBOLIC:
ref = ref.resolve()
try:
obj = self.repo[ref.target]
if isinstance(obj, Tag):
return str(obj.peel(GIT_OBJ_COMMIT).id)
except ValueError:
pass

return str(ref.target)

def remove_ref(self, name: str, old_ref: Optional[str] = None):
Expand Down
3 changes: 3 additions & 0 deletions tests/test_git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,12 @@ def test_get_ref(tmp_dir: TmpDir, scm: Git, git: Git):
): "ref: refs/heads/master",
}
)
scm.tag(["-a", "annotated", "-m", "Annotated Tag"])

assert init_rev == git.get_ref("refs/foo/bar")
assert init_rev == git.get_ref("refs/foo/baz")
assert init_rev == git.get_ref("refs/tags/annotated", follow=True)
assert init_rev == git.get_ref("refs/tags/annotated", follow=False)
assert git.get_ref("refs/foo/baz", follow=False) == "refs/heads/master"
assert git.get_ref("refs/foo/qux") is None

Expand Down