troldspejlet/forgejo-cli
troldspejlet/forgejo-cli
1
0
Fork 0
mirror of https://codeberg.org/Cyborus/forgejo-cli.git synced 2024-11-10 12:09:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: prioritize remote tracking branch in repo detection

Browse source
This commit is contained in:
Cyborus 2024-07-13 20:28:42 -04:00
parent 1003575645
commit 6fe22f5383
No known key found for this signature in database
1 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/repo.rs
View file

@ -73,19 +73,37 @@ impl RepoInfo {
let (remote_url, remote_repo_name) = { let (remote_url, remote_repo_name) = {
let mut out = (None, None); let mut out = (None, None);
if let Ok(local_repo) = git2::Repository::open(".") { if let Ok(local_repo) = git2::Repository::open(".") {
// help to escape scopes let mut name = remote.map(|s| s.to_owned());
let tmp;
let mut tmp2;
let mut name = remote;
// if there's only one remote, use that // if there's only one remote, use that
if name.is_none() { if name.is_none() {
let all_remotes = local_repo.remotes()?; let all_remotes = local_repo.remotes()?;
if all_remotes.len() == 1 { if all_remotes.len() == 1 {
if let Some(remote_name) = all_remotes.get(0) { if let Some(remote_name) = all_remotes.get(0) {
tmp2 = Some(remote_name.to_owned()); name = Some(remote_name.to_owned());
name = tmp2.as_deref(); }
}
}
// if the current branch is tracking a remote branch, use that remote
if name.is_none() {
let head = local_repo.head()?;
let branch_name = head.name().ok_or_eyre("branch name not UTF-8")?;
if let Ok(remote_name) = local_repo.branch_upstream_remote(branch_name) {
let remote_name_s =
remote_name.as_str().ok_or_eyre("remote name invalid")?;
if let Some(host_url) = &host_url {
let remote = local_repo.find_remote(&remote_name_s)?;
let url_s = std::str::from_utf8(remote.url_bytes())?;
let url = Url::parse(url_s)?;
if url.host_str() == host_url.host_str() {
name = Some(remote_name_s.to_owned());
}
} else {
name = Some(remote_name_s.to_owned());
} }
} }
} }
@ -109,31 +127,16 @@ impl RepoInfo {
if url.host_str() == host_url.host_str() if url.host_str() == host_url.host_str()
&& url.path() == host_url.path() && url.path() == host_url.path()
{ {
tmp2 = Some(remote_name.to_owned()); name = Some(remote_name.to_owned());
name = tmp2.as_deref(); break;
} }
} }
} }
} }
} }
// if the current branch is tracking a remote branch, use that remote
if name.is_none() {
let head = local_repo.head()?;
let branch_name = head.name().ok_or_else(|| eyre!("branch name not UTF-8"))?;
tmp = local_repo.branch_upstream_remote(branch_name).ok();
name = tmp
.as_ref()
.map(|remote| {
remote
.as_str()
.ok_or_else(|| eyre!("remote name not UTF-8"))
})
.transpose()?;
}
if let Some(name) = name { if let Some(name) = name {
if let Ok(remote) = local_repo.find_remote(name) { if let Ok(remote) = local_repo.find_remote(&name) {
let url_s = std::str::from_utf8(remote.url_bytes())?; let url_s = std::str::from_utf8(remote.url_bytes())?;
let url = Url::parse(url_s)?; let url = Url::parse(url_s)?;
let (url, name) = url_strip_repo_name(url)?; let (url, name) = url_strip_repo_name(url)?;