Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

git_ui: Fix remote branches missing from branch diff base picker (#60765)

Smit Barmasea21e87c07711
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index fbe39b5b7b0..61ed9987a22 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -264,7 +264,7 @@ impl BranchList {
.map(|repo| {
process_branches(
&repo.read(cx).branch_list,
- branch_selection_behavior.selected_branch(),
+ !branch_selection_behavior.is_select_only(),
)
})
.unwrap_or_default();
@@ -318,7 +318,7 @@ impl BranchList {
.and_then(|entry| entry.as_branch().map(|b| b.ref_name.clone()));
picker.delegate.all_branches = process_branches(
&branch_list,
- picker.delegate.branch_selection_behavior.selected_branch(),
+ !picker.delegate.branch_selection_behavior.is_select_only(),
);
picker.delegate.branch_list_error = branch_list_error;
picker.refresh(window, cx);
@@ -917,31 +917,30 @@ fn sort_branch_entries(
});
}
-fn process_branches(
- branches: &Arc<[Branch]>,
- preserved_branch: Option<&SharedString>,
-) -> Vec<Branch> {
- let remote_upstreams: HashSet<_> = branches
- .iter()
- .filter_map(|branch| {
- branch
- .upstream
- .as_ref()
- .filter(|upstream| upstream.is_remote())
- .map(|upstream| upstream.ref_name.clone())
- })
- .collect();
-
- let mut result: Vec<Branch> = branches
- .iter()
- .filter(|branch| {
- !remote_upstreams.contains(&branch.ref_name)
- || preserved_branch
+// Tracked remote branches are:
+// - collapsed when checking out to avoid detaching HEAD.
+// - kept when selecting a diff base because they may point to a different commit.
+fn process_branches(branches: &Arc<[Branch]>, collapse_tracked_remotes: bool) -> Vec<Branch> {
+ let mut result: Vec<Branch> = if collapse_tracked_remotes {
+ let remote_upstreams: HashSet<_> = branches
+ .iter()
+ .filter_map(|branch| {
+ branch
+ .upstream
.as_ref()
- .is_some_and(|preserved_branch| branch_matches_ref(branch, preserved_branch))
- })
- .cloned()
- .collect();
+ .filter(|upstream| upstream.is_remote())
+ .map(|upstream| upstream.ref_name.clone())
+ })
+ .collect();
+
+ branches
+ .iter()
+ .filter(|branch| !remote_upstreams.contains(&branch.ref_name))
+ .cloned()
+ .collect()
+ } else {
+ branches.to_vec()
+ };
result.sort_by_key(|branch| {
(
@@ -2124,8 +2123,7 @@ mod tests {
}
#[test]
- fn test_select_branch_preserves_selected_remote_upstream_and_prioritizes_active_remote_branches()
- {
+ fn test_select_branch_shows_tracked_remotes_and_prioritizes_active_remote_branches() {
let selected_branch = SharedString::from("origin/main");
let branches: Arc<[Branch]> = Arc::from([
create_test_branch_with_upstream(
@@ -2147,18 +2145,25 @@ mod tests {
create_test_branch("main", false, Some("fork"), Some(800)),
]);
- let processed_branches = process_branches(&branches, Some(&selected_branch));
+ let checkout_branches = process_branches(&branches, true);
assert!(
- processed_branches
+ checkout_branches
.iter()
- .any(|branch| branch.name() == "origin/main"),
- "the selected remote branch should be preserved even when a local branch tracks it"
+ .all(|branch| branch.name() != "origin/main" && branch.name() != "origin/feature"),
+ "remote branches tracked by a local branch should be collapsed when checking out"
+ );
+
+ let processed_branches = process_branches(&branches, false);
+ assert_eq!(
+ processed_branches.len(),
+ branches.len(),
+ "no branches should be filtered out when selecting a branch"
);
assert!(
processed_branches
.iter()
- .all(|branch| branch.name() != "origin/feature"),
- "the active branch's unselected remote upstream should still be collapsed"
+ .any(|branch| branch.name() == "origin/main"),
+ "remote branches should be selectable even when a local branch tracks them"
);
let mut entries = processed_branches
@@ -2884,6 +2889,105 @@ mod tests {
assert!(BranchFilter::Remote.next() == BranchFilter::All);
}
+ #[gpui::test]
+ async fn test_select_picker_lists_remote_branch_tracked_by_local_branch(
+ cx: &mut TestAppContext,
+ ) {
+ init_test(cx);
+ let (project, repository) = init_fake_repository(cx).await;
+ cx.run_until_parked();
+
+ // Local `main` tracks `origin/main`; the two can point to different
+ // commits, so both must be offered when picking a diff base.
+ let branches = vec![
+ create_test_branch_with_upstream(
+ "main",
+ true,
+ None,
+ Some(1000),
+ Some("refs/remotes/origin/main"),
+ ),
+ create_test_branch("main", false, Some("origin"), Some(900)),
+ ];
+ repository.update(cx, |repository, cx| {
+ repository.set_branch_list_for_test(branches, cx);
+ });
+
+ let window_handle =
+ cx.add_window(|window, cx| MultiWorkspace::test_new(project, window, cx));
+ let workspace = window_handle
+ .read_with(cx, |multi_workspace, _| multi_workspace.workspace().clone())
+ .unwrap();
+
+ let checkout_list = window_handle
+ .update(cx, |_, window, cx| {
+ cx.new(|cx| {
+ BranchList::new(
+ workspace.downgrade(),
+ Some(repository.clone()),
+ BranchListStyle::Modal,
+ rems(34.),
+ window,
+ cx,
+ )
+ })
+ })
+ .unwrap();
+ let select_list = window_handle
+ .update(cx, |_, window, cx| {
+ cx.new(|cx| {
+ BranchList::new_select(
+ workspace.downgrade(),
+ Some(repository.clone()),
+ BranchListStyle::Modal,
+ rems(34.),
+ Some("main".into()),
+ Arc::new(|_: Branch, _: &mut Window, _: &mut App| {}),
+ window,
+ cx,
+ )
+ })
+ })
+ .unwrap();
+
+ let mut ctx = VisualTestContext::from_window(window_handle.into(), cx);
+ let cx = &mut ctx;
+
+ update_branch_list_matches_with_empty_query(&checkout_list, cx).await;
+ checkout_list.update(cx, |branch_list, cx| {
+ branch_list.picker.update(cx, |picker, _cx| {
+ let names = picker
+ .delegate
+ .matches
+ .iter()
+ .map(Entry::name)
+ .collect::<Vec<_>>();
+ assert_eq!(
+ names,
+ vec!["main"],
+ "the checkout picker should collapse remote branches tracked by a local branch"
+ );
+ })
+ });
+
+ update_branch_list_matches_with_empty_query(&select_list, cx).await;
+ select_list.update(cx, |branch_list, cx| {
+ branch_list.picker.update(cx, |picker, _cx| {
+ let names = picker
+ .delegate
+ .matches
+ .iter()
+ .map(Entry::name)
+ .collect::<HashSet<_>>();
+ assert_eq!(
+ names,
+ ["main", "origin/main"].into_iter().collect::<HashSet<_>>(),
+ "the select picker should offer both a local branch and its remote upstream"
+ );
+ })
+ });
+ }
+
#[gpui::test]
async fn test_new_branch_creation_with_query(cx: &mut TestAppContext) {
const MAIN_BRANCH: &str = "main";
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 550433c7ec8..f2aa24d51a5 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -9904,6 +9904,11 @@ async fn append_pattern_to_ignore_file(
#[cfg(any(test, feature = "test-support"))]
impl Repository {
+ pub fn set_branch_list_for_test(&mut self, branches: Vec<Branch>, cx: &mut Context<Self>) {
+ self.snapshot.branch_list = branches.into();
+ cx.emit(RepositoryEvent::BranchListChanged);
+ }
+
pub fn loaded_commit_data_for_test(&self) -> HashMap<Oid, CommitData> {
self.commit_data
.iter()