Skip to content

Commit 3a66fa3

Browse files
charliermarshcharliermarsh
committed
Store a GitOid directly on GitReference
1 parent 29226b0 commit 3a66fa3

File tree

5 files changed

+31
-39
lines changed

5 files changed

+31
-39
lines changed

‎crates/uv-git/src/git.rs‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use std::env;
55
use std::fmt::Display;
66
use std::path::{Path, PathBuf};
7-
use std::str::{self, FromStr};
7+
use std::str::{self};
88
use std::sync::LazyLock;
99

1010
use anyhow::{Context, Result};
@@ -54,7 +54,7 @@ pub enum GitReference {
5454
/// From a named reference, like `refs/pull/493/head`.
5555
NamedRef(String),
5656
/// From a specific revision, using a full 40-character commit hash.
57-
FullCommit(String),
57+
FullCommit(GitOid),
5858
/// The default branch of the repository, the reference named `HEAD`.
5959
DefaultBranch,
6060
}
@@ -87,7 +87,7 @@ impl GitReference {
8787
Self::Branch(rev) => Some(rev),
8888
Self::BranchOrTag(rev) => Some(rev),
8989
Self::BranchOrTagOrCommit(rev) => Some(rev),
90-
Self::FullCommit(rev) => Some(rev),
90+
Self::FullCommit(rev) => Some(rev.as_str()),
9191
Self::NamedRef(rev) => Some(rev),
9292
Self::DefaultBranch => None,
9393
}
@@ -100,7 +100,7 @@ impl GitReference {
100100
Self::Branch(rev) => rev,
101101
Self::BranchOrTag(rev) => rev,
102102
Self::BranchOrTagOrCommit(rev) => rev,
103-
Self::FullCommit(rev) => rev,
103+
Self::FullCommit(rev) => rev.as_str(),
104104
Self::NamedRef(rev) => rev,
105105
Self::DefaultBranch => "HEAD",
106106
}
@@ -122,7 +122,7 @@ impl GitReference {
122122
/// Returns the precise [`GitOid`] of this reference, if it's a full commit.
123123
pub(crate) fn as_sha(&self) -> Option<GitOid> {
124124
if let Self::FullCommit(rev) = self {
125-
Some(GitOid::from_str(rev).expect("Full commit should be exactly 40 characters"))
125+
Some(*rev)
126126
} else {
127127
None
128128
}
@@ -241,7 +241,7 @@ impl GitRemote {
241241
locked_rev: Option<GitOid>,
242242
client: &ClientWithMiddleware,
243243
) -> Result<(GitDatabase, GitOid)> {
244-
let locked_ref = locked_rev.map(|oid| GitReference::FullCommit(oid.to_string()));
244+
let locked_ref = locked_rev.map(GitReference::FullCommit);
245245
let reference = locked_ref.as_ref().unwrap_or(reference);
246246
let enable_lfs_fetch = env::var(EnvVars::UV_GIT_LFS).is_ok();
247247

@@ -362,8 +362,11 @@ impl GitReference {
362362
// We'll be using the HEAD commit.
363363
Self::DefaultBranch => repo.rev_parse("refs/remotes/origin/HEAD"),
364364

365+
// Resolve a named reference.
366+
Self::NamedRef(s) => repo.rev_parse(&format!("{s}^0")),
367+
365368
// Resolve a direct commit reference.
366-
Self::FullCommit(s) | Self::NamedRef(s) => repo.rev_parse(&format!("{s}^0")),
369+
Self::FullCommit(s) => repo.rev_parse(&format!("{s}^0")),
367370
};
368371

369372
result.with_context(|| anyhow::format_err!("failed to find {refkind} `{self}`"))
@@ -543,17 +546,7 @@ pub(crate) fn fetch(
543546
}
544547

545548
GitReference::FullCommit(rev) => {
546-
if let Some(oid_to_fetch) = oid_to_fetch {
547-
refspecs.push(format!("+{oid_to_fetch}:refs/commit/{oid_to_fetch}"));
548-
} else {
549-
// There is a specific commit to fetch and we will do so in shallow-mode only
550-
// to not disturb the previous logic.
551-
// Note that with typical settings for shallowing, we will just fetch a single `rev`
552-
// as single commit.
553-
// The reason we write to `refs/remotes/origin/HEAD` is that it's of special significance
554-
// when during `GitReference::resolve()`, but otherwise it shouldn't matter.
555-
refspecs.push(format!("+{rev}:refs/remotes/origin/HEAD"));
556-
}
549+
refspecs.push(format!("+{rev}:refs/commit/{rev}"));
557550
}
558551
}
559552

@@ -753,16 +746,15 @@ fn github_fast_path(
753746
GitReference::FullCommit(rev) => {
754747
debug!("Skipping GitHub fast path; full commit hash provided: {rev}");
755748

756-
let rev = GitOid::from_str(rev)?;
757749
if let Some(ref local_object) = local_object {
758-
if rev == *local_object {
750+
if rev == local_object {
759751
return Ok(FastPathRev::UpToDate);
760752
}
761753
}
762754

763755
// If we know the reference is a full commit hash, we can just return it without
764756
// querying GitHub.
765-
return Ok(FastPathRev::NeedsFetch(rev));
757+
return Ok(FastPathRev::NeedsFetch(*rev));
766758
}
767759
};
768760

‎crates/uv-git/src/lib.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,13 @@ impl From<GitUrl> for Url {
113113
} else {
114114
// Otherwise, add the branch or tag name.
115115
match git.reference {
116+
GitReference::FullCommit(rev) => {
117+
url.set_path(&format!("{}@{}", url.path(), rev));
118+
}
116119
GitReference::Branch(rev)
117120
| GitReference::Tag(rev)
118121
| GitReference::BranchOrTag(rev)
119122
| GitReference::NamedRef(rev)
120-
| GitReference::FullCommit(rev)
121123
| GitReference::BranchOrTagOrCommit(rev) => {
122124
url.set_path(&format!("{}@{}", url.path(), rev));
123125
}

‎crates/uv-pypi-types/src/requirement.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -735,19 +735,18 @@ impl From<RequirementSource> for RequirementSourceWire {
735735
// Put the requested reference in the query.
736736
match reference {
737737
GitReference::Branch(branch) => {
738-
url.query_pairs_mut()
739-
.append_pair("branch", branch.to_string().as_str());
738+
url.query_pairs_mut().append_pair("branch", branch.as_str());
740739
}
741740
GitReference::Tag(tag) => {
742-
url.query_pairs_mut()
743-
.append_pair("tag", tag.to_string().as_str());
741+
url.query_pairs_mut().append_pair("tag", tag.as_str());
744742
}
745743
GitReference::BranchOrTag(rev)
746744
| GitReference::BranchOrTagOrCommit(rev)
747-
| GitReference::NamedRef(rev)
748-
| GitReference::FullCommit(rev) => {
749-
url.query_pairs_mut()
750-
.append_pair("rev", rev.to_string().as_str());
745+
| GitReference::NamedRef(rev) => {
746+
url.query_pairs_mut().append_pair("rev", rev.as_str());
747+
}
748+
GitReference::FullCommit(rev) => {
749+
url.query_pairs_mut().append_pair("rev", rev.as_str());
751750
}
752751
GitReference::DefaultBranch => {}
753752
}

‎crates/uv-resolver/src/lock/mod.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3554,19 +3554,18 @@ fn locked_git_url(git_dist: &GitSourceDist) -> Url {
35543554
// Put the requested reference in the query.
35553555
match git_dist.git.reference() {
35563556
GitReference::Branch(branch) => {
3557-
url.query_pairs_mut()
3558-
.append_pair("branch", branch.to_string().as_str());
3557+
url.query_pairs_mut().append_pair("branch", branch.as_str());
35593558
}
35603559
GitReference::Tag(tag) => {
3561-
url.query_pairs_mut()
3562-
.append_pair("tag", tag.to_string().as_str());
3560+
url.query_pairs_mut().append_pair("tag", tag.as_str());
35633561
}
35643562
GitReference::BranchOrTag(rev)
35653563
| GitReference::BranchOrTagOrCommit(rev)
3566-
| GitReference::NamedRef(rev)
3567-
| GitReference::FullCommit(rev) => {
3568-
url.query_pairs_mut()
3569-
.append_pair("rev", rev.to_string().as_str());
3564+
| GitReference::NamedRef(rev) => {
3565+
url.query_pairs_mut().append_pair("rev", rev.as_str());
3566+
}
3567+
GitReference::FullCommit(rev) => {
3568+
url.query_pairs_mut().append_pair("rev", rev.as_str());
35703569
}
35713570
GitReference::DefaultBranch => {}
35723571
}

‎crates/uv-workspace/src/pyproject.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1423,7 +1423,7 @@ impl Source {
14231423
} => {
14241424
if rev.is_none() && tag.is_none() && branch.is_none() {
14251425
let rev = match reference {
1426-
GitReference::FullCommit(ref mut rev) => Some(mem::take(rev)),
1426+
GitReference::FullCommit(ref mut rev) => Some(rev.to_string()),
14271427
GitReference::Branch(ref mut rev) => Some(mem::take(rev)),
14281428
GitReference::Tag(ref mut rev) => Some(mem::take(rev)),
14291429
GitReference::BranchOrTag(ref mut rev) => Some(mem::take(rev)),

0 commit comments

Comments
 (0)