Skip to content
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

return peeled refs from GitClient.get_refs() if protocol-v2 is used #1413

Merged
merged 1 commit into from
Nov 2, 2024
+30 −2
Merged

return peeled refs from GitClient.get_refs() if protocol-v2 is used #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions dulwich/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,6 +1378,7 @@ def fetch_pack(
proto.write_pkt_line(b"command=ls-refs\n")
proto.write(b"0001") # delim-pkt
proto.write_pkt_line(b"symrefs")
proto.write_pkt_line(b"peel")
for prefix in ref_prefix:
proto.write_pkt_line(b"ref-prefix " + prefix)
proto.write_pkt_line(None)
Expand Down Expand Up @@ -1458,13 +1459,16 @@ def get_refs(self, path, protocol_version=None):
proto.write_pkt_line(b"command=ls-refs\n")
proto.write(b"0001") # delim-pkt
proto.write_pkt_line(b"symrefs")
proto.write_pkt_line(b"peel")
proto.write_pkt_line(None)
with proto:
try:
refs, _symrefs, _peeled = read_pkt_refs_v2(proto.read_pkt_seq())
refs, _symrefs, peeled = read_pkt_refs_v2(proto.read_pkt_seq())
except HangupException as exc:
raise _remote_error_from_stderr(stderr) from exc
proto.write_pkt_line(None)
for refname, refvalue in peeled.items():
refs[refname + PEELED_TAG_SUFFIX] = refvalue
return refs
else:
with proto:
Expand Down Expand Up @@ -2407,6 +2411,7 @@ def begin_protocol_v2(proto):
pkt_line(b"command=ls-refs\n")
+ b"0001"
+ pkt_line(b"symrefs")
+ pkt_line(b"peel")
+ b"0000",
)
proto = Protocol(read, None)
Expand Down Expand Up @@ -2673,7 +2678,9 @@ def fetch_pack(
def get_refs(self, path):
"""Retrieve the current refs from a git smart server."""
url = self._get_url(path)
refs, _, _, _, _ = self._discover_references(b"git-upload-pack", url)
refs, _, _, _, peeled = self._discover_references(b"git-upload-pack", url)
for refname, refvalue in peeled.items():
refs[refname + PEELED_TAG_SUFFIX] = refvalue
return refs

def get_url(self, path):
Expand Down
21 changes: 21 additions & 0 deletions tests/compat/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
from urllib.parse import unquote

from dulwich import client, file, index, objects, protocol, repo
from dulwich.porcelain import tag_create

from .. import SkipTest, expectedFailure
from .utils import (
Expand Down Expand Up @@ -249,6 +250,26 @@ def test_fetch_pack_with_nondefault_symref(self):
dest.refs.set_if_equals(r[0], None, r[1])
self.assertDestEqualsSrc()

def test_get_refs_with_peeled_tag(self):
tag_create(
os.path.join(self.gitroot, "server_new.export"),
b"v1.0",
message="tagging".encode("ascii"),
annotated=True,
)
c = self._client()
refs = c.get_refs(self._build_path("/server_new.export"))
self.assertEqual(
[
b"HEAD",
b"refs/heads/branch",
b"refs/heads/master",
b"refs/tags/v1.0",
b"refs/tags/v1.0^{}",
],
sorted(refs.keys()),
)

def test_fetch_pack_depth(self):
c = self._client()
with repo.Repo(os.path.join(self.gitroot, "dest")) as dest:
Expand Down
Loading