cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-16 20:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

git: extract a function that can be reused for pushing branch-deletion

Browse Source
This commit is contained in:
Martin von Zweigbergk 2021-08-04 19:28:48 -07:00
parent 7dc82c1580
commit e57948347e
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/src/git.rs
View File

@ -168,18 +168,34 @@ pub enum GitPushError {
pub fn push_commit( pub fn push_commit(
git_repo: &git2::Repository, git_repo: &git2::Repository,
commit: &Commit, target: &Commit,
remote_name: &str, remote_name: &str,
remote_branch: &str, remote_branch: &str,
) -> Result<(), GitPushError> { ) -> Result<(), GitPushError> {
// Create a temporary ref to work around https://github.com/libgit2/libgit2/issues/3178 // Create a temporary ref to work around https://github.com/libgit2/libgit2/issues/3178
let temp_ref_name = format!("refs/jj/git-push/{}", commit.id().hex()); let temp_ref_name = format!("refs/jj/git-push/{}", target.id().hex());
let mut temp_ref = git_repo.reference( let mut temp_ref = git_repo.reference(
&temp_ref_name, &temp_ref_name,
git2::Oid::from_bytes(&commit.id().0).unwrap(), git2::Oid::from_bytes(&target.id().0).unwrap(),
true, true,
"temporary reference for git push", "temporary reference for git push",
)?; )?;
// Need to add "refs/heads/" prefix due to https://github.com/libgit2/libgit2/issues/1125
let qualified_remote_branch = format!("refs/heads/{}", remote_branch);
let refspec = format!("{}:{}", temp_ref_name, qualified_remote_branch);
let result = push_ref(git_repo, remote_name, &qualified_remote_branch, &refspec);
// TODO: Figure out how to do the equivalent of absl::Cleanup for
// temp_ref.delete().
temp_ref.delete()?;
result
}
fn push_ref(
git_repo: &git2::Repository,
remote_name: &str,
qualified_remote_branch: &str,
refspec: &str,
) -> Result<(), GitPushError> {
let mut remote = let mut remote =
git_repo git_repo
.find_remote(remote_name) .find_remote(remote_name)
@ -192,8 +208,6 @@ pub fn push_commit(
} }
_ => GitPushError::InternalGitError(err), _ => GitPushError::InternalGitError(err),
})?; })?;
// Need to add "refs/heads/" prefix due to https://github.com/libgit2/libgit2/issues/1125
let qualified_remote_branch = format!("refs/heads/{}", remote_branch);
let mut callbacks = git2::RemoteCallbacks::new(); let mut callbacks = git2::RemoteCallbacks::new();
let mut updated = false; let mut updated = false;
callbacks.credentials(|_url, username_from_url, _allowed_types| { callbacks.credentials(|_url, username_from_url, _allowed_types| {
@ -205,7 +219,6 @@ pub fn push_commit(
} }
Ok(()) Ok(())
}); });
let refspec = format!("{}:{}", temp_ref_name, qualified_remote_branch);
let mut push_options = git2::PushOptions::new(); let mut push_options = git2::PushOptions::new();
push_options.remote_callbacks(callbacks); push_options.remote_callbacks(callbacks);
remote remote
@ -217,7 +230,6 @@ pub fn push_commit(
_ => GitPushError::InternalGitError(err), _ => GitPushError::InternalGitError(err),
})?; })?;
drop(push_options); drop(push_options);
temp_ref.delete()?;
if updated { if updated {
Ok(()) Ok(())
} else { } else {