Skip to content

Commit 5464bfb

Browse files
ByronByron
committed
adapt to changes in gix-ref 
1 parent 43d8096 commit 5464bfb

File tree

10 files changed

+28
-28
lines changed

10 files changed

+28
-28
lines changed

‎gix/src/clone/fetch/util.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub fn update_head(
129129
change: gix_ref::transaction::Change::Update {
130130
log: reflog_message(),
131131
expected: PreviousValue::Any,
132-
new: Target::Peeled(head_peeled_id.to_owned()),
132+
new: Target::Object(head_peeled_id.to_owned()),
133133
},
134134
name: referent.clone(),
135135
deref: false,
@@ -155,7 +155,7 @@ pub fn update_head(
155155
change: gix_ref::transaction::Change::Update {
156156
log,
157157
expected: PreviousValue::Any,
158-
new: Target::Peeled(head_peeled_id.to_owned()),
158+
new: Target::Object(head_peeled_id.to_owned()),
159159
},
160160
name: head,
161161
deref: false,
@@ -169,7 +169,7 @@ pub fn update_head(
169169
change: gix_ref::transaction::Change::Update {
170170
log: reflog_message(),
171171
expected: PreviousValue::Any,
172-
new: Target::Peeled(
172+
new: Target::Object(
173173
head_peeled_id
174174
.expect("detached heads always point to something")
175175
.to_owned(),

‎gix/src/reference/edits.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ pub mod set_target_id {
3636
) -> Result<(), Error> {
3737
match &self.inner.target {
3838
Target::Symbolic(name) => return Err(Error::SymbolicReference { name: name.clone() }),
39-
Target::Peeled(current_id) => {
39+
Target::Object(current_id) => {
4040
let changed = self.repo.reference(
4141
self.name(),
4242
id,
43-
PreviousValue::MustExistAndMatch(Target::Peeled(current_id.to_owned())),
43+
PreviousValue::MustExistAndMatch(Target::Object(current_id.to_owned())),
4444
reflog_message,
4545
)?;
4646
*self = changed;

‎gix/src/reference/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl<'repo> Reference<'repo> {
2525
pub fn try_id(&self) -> Option<Id<'repo>> {
2626
match self.inner.target {
2727
gix_ref::Target::Symbolic(_) => None,
28-
gix_ref::Target::Peeled(oid) => oid.to_owned().attach(self.repo).into(),
28+
gix_ref::Target::Object(oid) => oid.to_owned().attach(self.repo).into(),
2929
}
3030
}
3131

‎gix/src/remote/connection/fetch/update_refs/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,14 @@ pub(crate) fn update(
238238
let new = new_value_by_remote(repo, remote, mappings)?;
239239
let type_change = match (&previous_value, &new) {
240240
(
241-
PreviousValue::ExistingMustMatch(Target::Peeled(_))
242-
| PreviousValue::MustExistAndMatch(Target::Peeled(_)),
241+
PreviousValue::ExistingMustMatch(Target::Object(_))
242+
| PreviousValue::MustExistAndMatch(Target::Object(_)),
243243
Target::Symbolic(_),
244244
) => Some(TypeChange::DirectToSymbolic),
245245
(
246246
PreviousValue::ExistingMustMatch(Target::Symbolic(_))
247247
| PreviousValue::MustExistAndMatch(Target::Symbolic(_)),
248-
Target::Peeled(_),
248+
Target::Object(_),
249249
) => Some(TypeChange::SymbolicToDirect),
250250
_ => None,
251251
};
@@ -349,7 +349,7 @@ fn update_needs_adjustment_as_edits_symbolic_target_is_missing(
349349
edits: &[RefEdit],
350350
) -> bool {
351351
match edit.change.new_value().expect("here we need a symlink") {
352-
TargetRef::Peeled(_) => unreachable!("BUG: we already know it's symbolic"),
352+
TargetRef::Object(_) => unreachable!("BUG: we already know it's symbolic"),
353353
TargetRef::Symbolic(new_target_ref) => {
354354
match &edit.change {
355355
Change::Update { expected, .. } => match expected {
@@ -422,7 +422,7 @@ fn new_value_by_remote(
422422
Target::Symbolic(target.try_into()?)
423423
} else {
424424
// born branches that we don't have in our refspecs we create peeled. That way they can be used.
425-
Target::Peeled(desired_id.to_owned())
425+
Target::Object(desired_id.to_owned())
426426
}
427427
}
428428
// Unborn branches we create as such, with the location they point to on the remote which helps mirroring.
@@ -431,7 +431,7 @@ fn new_value_by_remote(
431431
}
432432
}
433433
} else {
434-
Target::Peeled(remote_id.expect("unborn case handled earlier").to_owned())
434+
Target::Object(remote_id.expect("unborn case handled earlier").to_owned())
435435
},
436436
)
437437
}

‎gix/src/remote/connection/fetch/update_refs/tests.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ mod update {
377377
}]
378378
);
379379
assert_eq!(out.edits.len(), 1);
380-
let target = Target::Peeled(hex_to_id("66f16e4e8baf5c77bb6d0484495bebea80e916ce"));
380+
let target = Target::Object(hex_to_id("66f16e4e8baf5c77bb6d0484495bebea80e916ce"));
381381
assert_eq!(
382382
out.edits[0],
383383
RefEdit {
@@ -521,7 +521,7 @@ mod update {
521521
expected: PreviousValue::MustExistAndMatch(Target::Symbolic(
522522
"refs/heads/main".try_into().expect("valid"),
523523
)),
524-
new: Target::Peeled(hex_to_id("f99771fe6a1b535783af3163eba95a927aae21d5")),
524+
new: Target::Object(hex_to_id("f99771fe6a1b535783af3163eba95a927aae21d5")),
525525
},
526526
name: "refs/heads/symbolic".try_into().expect("valid"),
527527
deref: false,
@@ -543,7 +543,7 @@ mod update {
543543
force_create_reflog: false,
544544
message: "action: no update will be performed".into(),
545545
},
546-
expected: PreviousValue::MustExistAndMatch(Target::Peeled(hex_to_id(
546+
expected: PreviousValue::MustExistAndMatch(Target::Object(hex_to_id(
547547
"f99771fe6a1b535783af3163eba95a927aae21d5",
548548
))),
549549
new: Target::Symbolic("refs/heads/main".try_into().expect("valid")),
@@ -938,7 +938,7 @@ mod update {
938938
fn into_remote_ref(mut r: gix::Reference<'_>) -> gix_protocol::handshake::Ref {
939939
let full_ref_name = r.name().as_bstr().into();
940940
match r.target() {
941-
TargetRef::Peeled(id) => gix_protocol::handshake::Ref::Direct {
941+
TargetRef::Object(id) => gix_protocol::handshake::Ref::Direct {
942942
full_ref_name,
943943
object: id.into(),
944944
},

‎gix/src/repository/object.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ impl crate::Repository {
304304
force_create_reflog: false,
305305
message: crate::reference::log::message("commit", commit.message.as_ref(), commit.parents.len()),
306306
},
307-
expected: match commit.parents.first().map(|p| Target::Peeled(*p)) {
307+
expected: match commit.parents.first().map(|p| Target::Object(*p)) {
308308
Some(previous) => {
309309
if reference.as_bstr() == "HEAD" {
310310
PreviousValue::MustExistAndMatch(previous)
@@ -314,7 +314,7 @@ impl crate::Repository {
314314
}
315315
None => PreviousValue::MustNotExist,
316316
},
317-
new: Target::Peeled(commit_id.inner),
317+
new: Target::Object(commit_id.inner),
318318
},
319319
name: reference,
320320
deref: true,

‎gix/src/repository/reference.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl crate::Repository {
2323
change: Change::Update {
2424
log: Default::default(),
2525
expected: constraint,
26-
new: Target::Peeled(id),
26+
new: Target::Object(id),
2727
},
2828
name: format!("refs/tags/{}", name.as_ref()).try_into()?,
2929
deref: false,
@@ -106,7 +106,7 @@ impl crate::Repository {
106106
message: log_message,
107107
},
108108
expected: constraint,
109-
new: Target::Peeled(id),
109+
new: Target::Object(id),
110110
},
111111
name,
112112
deref: false,
@@ -119,7 +119,7 @@ impl crate::Repository {
119119

120120
Ok(gix_ref::Reference {
121121
name: edits.pop().expect("exactly one edit").name,
122-
target: Target::Peeled(id),
122+
target: Target::Object(id),
123123
peeled: None,
124124
}
125125
.attach(self))
@@ -162,7 +162,7 @@ impl crate::Repository {
162162
Err(reference::find::existing::Error::NotFound) => crate::head::Kind::Unborn(branch),
163163
Err(err) => return Err(err),
164164
},
165-
Target::Peeled(target) => crate::head::Kind::Detached {
165+
Target::Object(target) => crate::head::Kind::Detached {
166166
target,
167167
peeled: head.inner.peeled,
168168
},

‎gix/tests/clone/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ mod blocking_io {
347347
"if we set up a symref, the target should exist by now"
348348
)
349349
}
350-
TargetRef::Peeled(id) => {
350+
TargetRef::Object(id) => {
351351
assert!(repo.objects.exists(id), "part of the fetched pack");
352352
}
353353
}
@@ -362,7 +362,7 @@ mod blocking_io {
362362
.1
363363
.starts_with_str(remote_name));
364364
match r.target() {
365-
TargetRef::Peeled(_) => {
365+
TargetRef::Object(_) => {
366366
let mut logs = r.log_iter();
367367
assert_reflog(logs.all());
368368
}

‎gix/tests/reference/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ mod find {
6363

6464
assert_eq!(
6565
packed_tag_ref.inner.target,
66-
refs::Target::Peeled(hex_to_id("4c3f4cce493d7beb45012e478021b5f65295e5a3")),
66+
refs::Target::Object(hex_to_id("4c3f4cce493d7beb45012e478021b5f65295e5a3")),
6767
"it points to a tag object"
6868
);
6969

@@ -99,7 +99,7 @@ mod find {
9999
symbolic_ref = symbolic_ref.follow().expect("another hop")?;
100100
assert_eq!(symbolic_ref.target(), second_hop.to_ref());
101101

102-
let last_hop = Target::Peeled(hex_to_id("134385f6d781b7e97062102c6a483440bfda2a03"));
102+
let last_hop = Target::Object(hex_to_id("134385f6d781b7e97062102c6a483440bfda2a03"));
103103
symbolic_ref = symbolic_ref.follow().expect("another hop")?;
104104
assert_eq!(symbolic_ref.target(), last_hop.to_ref());
105105

‎gix/tests/remote/fetch.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ mod blocking_and_async_io {
620620
let edit = edit.expect("refedit present even if it's a no-op");
621621
if dry_run {
622622
match edit.change.new_value().expect("no deletions") {
623-
gix_ref::TargetRef::Peeled(id) => {
623+
gix_ref::TargetRef::Object(id) => {
624624
assert_eq!(id, mapping.remote.as_id().expect("no unborn"))
625625
}
626626
gix_ref::TargetRef::Symbolic(target) => {
@@ -634,7 +634,7 @@ mod blocking_and_async_io {
634634
} else {
635635
let r = repo.find_reference(edit.name.as_ref()).unwrap();
636636
match r.target() {
637-
gix_ref::TargetRef::Peeled(id) => {
637+
gix_ref::TargetRef::Object(id) => {
638638
assert_eq!(
639639
id,
640640
mapping.remote.as_id().expect("no unborn"),

0 commit comments

Comments
 (0)