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

Jump to bottom

git-checkout: Support branchless commits #181

Merged
merged 1 commit into from
Oct 12, 2024
Merged

git-checkout: Support branchless commits #181

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
7 changes: 7 additions & 0 deletions src/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,13 @@ impl<'git, 'ctx> Git<'ctx> {
.map(|_| ())
}

/// Fetch the specified ref of a remote.
pub async fn fetch_ref(self, remote: &str, reference: &str) -> Result<()> {
self.spawn_with(|c| c.arg("fetch").arg(remote).arg(reference))
.await
.map(|_| ())
}

/// Stage all local changes.
pub async fn add_all(self) -> Result<()> {
self.spawn_with(|c| c.arg("add").arg("--all"))
Expand Down
21 changes: 18 additions & 3 deletions src/sess.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ impl<'io, 'sess: 'io, 'ctx: 'sess> SessionIo<'sess, 'ctx> {
}
DependencySource::Path(_) => Ok(DependencyVersions::Path),
DependencySource::Git(ref url) => {
let db = self.git_database(&dep.name, url, force_fetch).await?;
let db = self.git_database(&dep.name, url, force_fetch, None).await?;
self.git_versions_func(db)
.await
.map(DependencyVersions::Git)
Expand All @@ -477,6 +477,7 @@ impl<'io, 'sess: 'io, 'ctx: 'sess> SessionIo<'sess, 'ctx> {
name: &str,
url: &str,
force_fetch: bool,
fetch_ref: Option<&str>,
) -> Result<Git<'ctx>> {
// TODO: Make the assembled future shared and keep it in a lookup table.
// Then use that table to return the future if it already exists.
Expand Down Expand Up @@ -533,6 +534,13 @@ impl<'io, 'sess: 'io, 'ctx: 'sess> SessionIo<'sess, 'ctx> {
.and_then(|_| git.spawn_with(|c| c.arg("init").arg("--bare")))
.and_then(|_| git.spawn_with(|c| c.arg("remote").arg("add").arg("origin").arg(url)))
.and_then(|_| git.fetch("origin"))
.and_then(|_| async {
if let Some(reference) = fetch_ref {
git.fetch_ref("origin", reference).await
} else {
Ok(())
}
})
.await
.map_err(move |cause| {
if url3.contains("git@") {
Expand All @@ -559,6 +567,13 @@ impl<'io, 'sess: 'io, 'ctx: 'sess> SessionIo<'sess, 'ctx> {
Ok(())
})
.and_then(|_| git.fetch("origin"))
.and_then(|_| async {
if let Some(reference) = fetch_ref {
git.fetch_ref("origin", reference).await
} else {
Ok(())
}
})
.await
.map_err(move |cause| {
if url3.contains("git@") {
Expand Down Expand Up @@ -841,7 +856,7 @@ impl<'io, 'sess: 'io, 'ctx: 'sess> SessionIo<'sess, 'ctx> {
// branches or tags for shallow clones.
let tag_name_0 = format!("bender-tmp-{}", revision);
let tag_name_1 = tag_name_0.clone();
let git = self.git_database(name, url, false).await?;
let git = self.git_database(name, url, false, Some(revision)).await?;
git.spawn_with(move |c| c.arg("tag").arg(tag_name_0).arg(revision).arg("--force"))
.map_err(move |cause| {
warnln!("Please ensure the commits are available on the remote or run bender update");
Expand Down Expand Up @@ -1041,7 +1056,7 @@ impl<'io, 'sess: 'io, 'ctx: 'sess> SessionIo<'sess, 'ctx> {
(DepSrc::Git(url), DepVer::Git(rev)) => {
let dep_name = self.sess.intern_string(dep.name.as_str());
// TODO MICHAERO: May need proper chaining using and_then
let db = self.git_database(&dep.name, url, false).await?;
let db = self.git_database(&dep.name, url, false, None).await?;
let entries = db.list_files(rev, Some("Bender.yml")).await?;
let data = match entries.into_iter().next() {
None => Ok(None),
Expand Down
Loading