Skip to content

Commit fcb21a4

Browse files
ByronByron
committed
adapt to changes in gix and gix-protocol 
1 parent e59fc09 commit fcb21a4

19 files changed

+217
-289
lines changed

‎gitoxide-core/src/pack/receive.rs

Lines changed: 145 additions & 260 deletions
Large diffs are not rendered by default.

‎gitoxide-core/src/repository/clone.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub(crate) mod function {
8989

9090
if handshake_info {
9191
writeln!(out, "Handshake Information")?;
92-
writeln!(out, "\t{:?}", fetch_outcome.ref_map.handshake)?;
92+
writeln!(out, "\t{:?}", fetch_outcome.handshake)?;
9393
}
9494

9595
match fetch_outcome.status {

‎gitoxide-core/src/repository/fetch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub(crate) mod function {
7070

7171
if handshake_info {
7272
writeln!(out, "Handshake Information")?;
73-
writeln!(out, "\t{:?}", res.ref_map.handshake)?;
73+
writeln!(out, "\t{:?}", res.handshake)?;
7474
}
7575

7676
let ref_specs = remote.refspecs(gix::remote::Direction::Fetch);

‎gitoxide-core/src/repository/remote.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ mod refs_impl {
7272
.context("Remote didn't have a URL to connect to")?
7373
.to_bstring()
7474
));
75-
let map = remote
75+
let (map, handshake) = remote
7676
.connect(gix::remote::Direction::Fetch)
7777
.await?
7878
.ref_map(
@@ -86,7 +86,7 @@ mod refs_impl {
8686

8787
if handshake_info {
8888
writeln!(out, "Handshake Information")?;
89-
writeln!(out, "\t{:?}", map.handshake)?;
89+
writeln!(out, "\t{handshake:?}")?;
9090
}
9191
match kind {
9292
refs::Kind::Tracking { .. } => print_refmap(

‎gix/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ worktree-archive = ["gix-archive", "worktree-stream", "attributes"]
160160
async-network-client = [
161161
"gix-protocol/async-client",
162162
"gix-pack/streaming-input",
163+
"dep:gix-transport",
163164
"attributes",
164165
"credentials",
165166
]

‎gix/src/remote/connection/ref_map.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,14 @@ where
8585
/// - `gitoxide.userAgent` is read to obtain the application user agent for git servers and for HTTP servers as well.
8686
#[allow(clippy::result_large_err)]
8787
#[gix_protocol::maybe_async::maybe_async]
88-
pub async fn ref_map(mut self, progress: impl Progress, options: Options) -> Result<fetch::RefMap, Error> {
89-
self.ref_map_by_ref(progress, options).await
88+
pub async fn ref_map(
89+
mut self,
90+
progress: impl Progress,
91+
options: Options,
92+
) -> Result<(fetch::RefMap, gix_protocol::handshake::Outcome), Error> {
93+
let refmap = self.ref_map_by_ref(progress, options).await;
94+
let handshake = self.handshake.expect("refmap always performs handshake");
95+
refmap.map(|map| (map, handshake))
9096
}
9197

9298
#[allow(clippy::result_large_err)]

‎gix/tests/gix/remote/ref_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ mod blocking_and_async_io {
6565
daemon.as_ref(),
6666
None,
6767
);
68-
let map = remote
68+
let (map, _handshake) = remote
6969
.connect(Fetch)
7070
.await?
7171
.ref_map(progress::Discard, Default::default())

‎justfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ check:
4747
if cargo check -p gix-transport --all-features 2>/dev/null; then false; else true; fi
4848
if cargo check -p gix-protocol --all-features 2>/dev/null; then false; else true; fi
4949
cargo tree -p gix --no-default-features -e normal -i imara-diff 2>&1 | grep warning # warning happens if nothing found, no exit code :/
50-
if cargo tree -p gix --no-default-features -i gix-protocol 2>/dev/null; then false; else true; fi
5150
cargo tree -p gix --no-default-features -e normal -i gix-submodule 2>&1 | grep warning
5251
cargo tree -p gix --no-default-features -e normal -i gix-pathspec 2>&1 | grep warning
5352
cargo tree -p gix --no-default-features -e normal -i gix-filter 2>&1 | grep warning

‎tests/journey/gix.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ title "gix (with repository)"
107107
)
108108
fi
109109

110+
# for some reason, on CI the daemon always shuts down before we can connect,
111+
# or isn't actually ready despite having accepted the first connection already.
110112
(with "git:// protocol"
111113
launch-git-daemon
112114
(with "version 1"
@@ -249,14 +251,14 @@ title "gix commit-graph"
249251
(with "version 2"
250252
(with "NO output directory"
251253
it "generates the correct output" && {
252-
WITH_SNAPSHOT="$snapshot/file-v-any-no-output" \
254+
WITH_SNAPSHOT="$snapshot/file-v-any-no-output-p2" \
253255
expect_run $SUCCESSFULLY "$exe_plumbing" --no-verbose free pack receive -p 2 .git
254256
}
255257
)
256258
(with "output directory"
257259
mkdir out/
258260
it "generates the correct output" && {
259-
WITH_SNAPSHOT="$snapshot/file-v-any-with-output" \
261+
WITH_SNAPSHOT="$snapshot/file-v-any-with-output-p2" \
260262
expect_run $SUCCESSFULLY "$exe_plumbing" --no-verbose free pack receive .git out/
261263
}
262264
it "creates an index and a pack in the output directory" && {
@@ -268,7 +270,7 @@ title "gix commit-graph"
268270
if test "$kind" = "max" || test "$kind" = "max-pure"; then
269271
(with "--format json"
270272
it "generates the correct output in JSON format" && {
271-
WITH_SNAPSHOT="$snapshot/file-v-any-no-output-json" \
273+
WITH_SNAPSHOT="$snapshot/file-v-any-no-output-json-p2" \
272274
expect_run $SUCCESSFULLY "$exe_plumbing" --no-verbose --format json free pack receive --protocol 2 .git
273275
}
274276
)
@@ -305,7 +307,7 @@ title "gix commit-graph"
305307
(with "NO output directory"
306308
(with "NO wanted refs"
307309
it "generates the correct output" && {
308-
WITH_SNAPSHOT="$snapshot/file-v-any-no-output" \
310+
WITH_SNAPSHOT="$snapshot/file-v-any-no-output-p2" \
309311
expect_run $SUCCESSFULLY "$exe_plumbing" --no-verbose free pack receive -p 2 git://localhost/
310312
}
311313
)
@@ -324,7 +326,7 @@ title "gix commit-graph"
324326
)
325327
(with "output directory"
326328
it "generates the correct output" && {
327-
WITH_SNAPSHOT="$snapshot/file-v-any-with-output" \
329+
WITH_SNAPSHOT="$snapshot/file-v-any-with-output-p2" \
328330
expect_run $SUCCESSFULLY "$exe_plumbing" --no-verbose free pack receive git://localhost/ out/
329331
}
330332
)

‎tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-no-output

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
index: c787de2aafb897417ca8167baeb146eabd18bc5f
2-
pack: 346574b7331dc3a1724da218d622c6e1b6c66a57
1+
index: 8e48437a86dfb3939de997bb66b4bbedde9c2259
2+
pack: 24d2f055141373bf1011f1b0fce5dd8929a3a869
33

44
3f72b39ad1600e6dac63430c15e0d875e9d3f9d6 HEAD symref-target:refs/heads/main
55
ee3c97678e89db4eab7420b04aef51758359f152 refs/heads/dev

‎tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-no-output-json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"index": {
33
"index_version": "V2",
4-
"index_hash": "c787de2aafb897417ca8167baeb146eabd18bc5f",
5-
"data_hash": "346574b7331dc3a1724da218d622c6e1b6c66a57",
4+
"index_hash": "8e48437a86dfb3939de997bb66b4bbedde9c2259",
5+
"data_hash": "24d2f055141373bf1011f1b0fce5dd8929a3a869",
66
"num_objects": 9
77
},
88
"pack_kind": "V2",

‎tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-no-output-json-p2

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"index": {
3+
"index_version": "V2",
4+
"index_hash": "8e48437a86dfb3939de997bb66b4bbedde9c2259",
5+
"data_hash": "24d2f055141373bf1011f1b0fce5dd8929a3a869",
6+
"num_objects": 9
7+
},
8+
"pack_kind": "V2",
9+
"index_path": null,
10+
"data_path": null,
11+
"refs": [
12+
{
13+
"Direct": {
14+
"path": "refs/heads/dev",
15+
"object": "ee3c97678e89db4eab7420b04aef51758359f152"
16+
}
17+
},
18+
{
19+
"Direct": {
20+
"path": "refs/heads/main",
21+
"object": "3f72b39ad1600e6dac63430c15e0d875e9d3f9d6"
22+
}
23+
}
24+
]
25+
}

‎tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-no-output-non-existing-single-ref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Error: unknown ref refs/heads/does-not-exist
1+
Error: None of the refspec(s) refs/heads/does-not-exist matched any of the 2 refs on the remote

‎tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-no-output-p2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
index: 8e48437a86dfb3939de997bb66b4bbedde9c2259
2+
pack: 24d2f055141373bf1011f1b0fce5dd8929a3a869
3+
4+
ee3c97678e89db4eab7420b04aef51758359f152 refs/heads/dev
5+
3f72b39ad1600e6dac63430c15e0d875e9d3f9d6 refs/heads/main

‎tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-no-output-single-ref

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
index: 3ff97f80d63a1261147ace4cb06191a2fd686ff6
2-
pack: de6c8d1e0ca3ee9331a3f92da74add15abd03049
1+
index: c787de2aafb897417ca8167baeb146eabd18bc5f
2+
pack: 346574b7331dc3a1724da218d622c6e1b6c66a57
3+
4+
ee3c97678e89db4eab7420b04aef51758359f152 refs/heads/dev
5+
3f72b39ad1600e6dac63430c15e0d875e9d3f9d6 refs/heads/main

‎tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-no-output-wanted-ref-p1

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
Error: Could not access repository or failed to read streaming pack file
2-
3-
Caused by:
4-
Want to get specific refs, but remote doesn't support this capability
1+
Error: None of the refspec(s) =refs/heads/main matched any of the 5 refs on the remote

‎tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-with-output

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
index: c787de2aafb897417ca8167baeb146eabd18bc5f (out/pack-346574b7331dc3a1724da218d622c6e1b6c66a57.idx)
2-
pack: 346574b7331dc3a1724da218d622c6e1b6c66a57 (out/pack-346574b7331dc3a1724da218d622c6e1b6c66a57.pack)
1+
index: 8e48437a86dfb3939de997bb66b4bbedde9c2259 (out/pack-24d2f055141373bf1011f1b0fce5dd8929a3a869.idx)
2+
pack: 24d2f055141373bf1011f1b0fce5dd8929a3a869 (out/pack-24d2f055141373bf1011f1b0fce5dd8929a3a869.pack)
33

44
3f72b39ad1600e6dac63430c15e0d875e9d3f9d6 HEAD symref-target:refs/heads/main
55
ee3c97678e89db4eab7420b04aef51758359f152 refs/heads/dev

‎tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-with-output-p2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
index: 8e48437a86dfb3939de997bb66b4bbedde9c2259 (out/pack-24d2f055141373bf1011f1b0fce5dd8929a3a869.idx)
2+
pack: 24d2f055141373bf1011f1b0fce5dd8929a3a869 (out/pack-24d2f055141373bf1011f1b0fce5dd8929a3a869.pack)
3+
4+
ee3c97678e89db4eab7420b04aef51758359f152 refs/heads/dev
5+
3f72b39ad1600e6dac63430c15e0d875e9d3f9d6 refs/heads/main

‎tests/snapshots/plumbing/no-repo/pack/receive/ls-in-output-dir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pack-346574b7331dc3a1724da218d622c6e1b6c66a57.idx
2-
pack-346574b7331dc3a1724da218d622c6e1b6c66a57.keep
3-
pack-346574b7331dc3a1724da218d622c6e1b6c66a57.pack
1+
pack-24d2f055141373bf1011f1b0fce5dd8929a3a869.idx
2+
pack-24d2f055141373bf1011f1b0fce5dd8929a3a869.keep
3+
pack-24d2f055141373bf1011f1b0fce5dd8929a3a869.pack

0 commit comments

Comments
 (0)