Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve handling of remote-tracking branches in the picker (#29744)

Browse source 
Release Notes:

- Changed the git branch picker to make remote-tracking branches less
prominent

---------

Co-authored-by: Anthony Eid <hello@anthonyeid.me>
This commit is contained in:
Cole Miller 2025-05-01 21:24:26 -04:00 • committed by GitHub
parent 92b9ecd7d2
commit e1e3f2e423
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 150 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/project/src/git_store.rs
View file

@ -3790,13 +3790,9 @@ impl Repository {
pub fn branches(&mut self) -> oneshot::Receiver<Result<Vec<Branch>>> {
let id = self.id;
self.send_job(None, move |repo, cx| async move {
self.send_job(None, move |repo, _| async move {
match repo {
RepositoryState::Local { backend, .. } => {
let backend = backend.clone();
cx.background_spawn(async move { backend.branches().await })
.await
}
RepositoryState::Local { backend, .. } => backend.branches().await,
RepositoryState::Remote { project_id, client } => {
let response = client
.request(proto::GitGetBranches {
@ -4460,7 +4456,7 @@ fn deserialize_blame_buffer_response(
fn branch_to_proto(branch: &git::repository::Branch) -> proto::Branch {
proto::Branch {
is_head: branch.is_head,
name: branch.name.to_string(),
ref_name: branch.ref_name.to_string(),
unix_timestamp: branch
.most_recent_commit
.as_ref()
@ -4489,7 +4485,7 @@ fn branch_to_proto(branch: &git::repository::Branch) -> proto::Branch {
fn proto_to_branch(proto: &proto::Branch) -> git::repository::Branch {
git::repository::Branch {
is_head: proto.is_head,
name: proto.name.clone().into(),
ref_name: proto.ref_name.clone().into(),
upstream: proto
.upstream
.as_ref()