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: Clarify remote-tracking branch delete in branch picker (#61793)

lldanb47a4ca595d3
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index a7989c422c5..aefe0d41253 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -33,9 +33,9 @@ use git_ui_core::notifications::show_error_toast;
actions!(
branch_picker,
[
- /// Deletes the selected git branch or remote.
+ /// Deletes the selected git branch. For a remote-tracking branch, this only removes the local tracking ref.
DeleteBranch,
- /// Force deletes the selected git branch or remote.
+ /// Force deletes the selected git branch. For a remote-tracking branch, this only removes the local tracking ref.
ForceDeleteBranch,
/// Show all branches.
ShowAllBranches,
@@ -841,6 +841,7 @@ struct DeleteBranchTooltip {
picker: WeakEntity<Picker<BranchListDelegate>>,
focus_handle: FocusHandle,
delete_index: usize,
+ is_remote: bool,
_subscription: Subscription,
}
@@ -849,6 +850,7 @@ impl DeleteBranchTooltip {
picker: Entity<Picker<BranchListDelegate>>,
focus_handle: FocusHandle,
delete_index: usize,
+ is_remote: bool,
cx: &mut Context<Self>,
) -> Self {
let subscription = cx.observe(&picker, |_, _, cx| cx.notify());
@@ -856,6 +858,7 @@ impl DeleteBranchTooltip {
picker: picker.downgrade(),
focus_handle,
delete_index,
+ is_remote,
_subscription: subscription,
}
}
@@ -863,6 +866,19 @@ impl DeleteBranchTooltip {
impl Render for DeleteBranchTooltip {
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+ // Git always force-deletes remote-tracking refs (`git branch -dr` skips the
+ // merged check), so there is no separate force delete to offer for them.
+ if self.is_remote {
+ return Tooltip::with_meta_in(
+ "Delete Local Tracking Branch",
+ Some(&branch_picker::DeleteBranch),
+ "Does not delete the branch on the remote",
+ &self.focus_handle,
+ cx,
+ )
+ .into_any_element();
+ }
+
let force_delete = self
.picker
.read_with(cx, |picker, _| {
@@ -1714,10 +1730,10 @@ impl PickerDelegate for BranchListDelegate {
Entry::NewUrl { .. } | Entry::NewBranch { .. } | Entry::NewRemoteName { .. }
);
- let deleted_branch_icon = |entry_ix: usize| {
+ let deleted_branch_icon = |entry_ix: usize, is_remote: bool| {
let picker = picker.clone();
let focus_handle = focus_handle.clone();
- let force_delete = self.is_force_delete_hovering_index(entry_ix);
+ let force_delete = !is_remote && self.is_force_delete_hovering_index(entry_ix);
div()
.id(("delete-hover", entry_ix))
@@ -1739,6 +1755,7 @@ impl PickerDelegate for BranchListDelegate {
picker.clone(),
focus_handle.clone(),
entry_ix,
+ is_remote,
cx,
)
})
@@ -1922,7 +1939,8 @@ impl PickerDelegate for BranchListDelegate {
.when(
!self.is_select_only() && !is_new_items && !is_head_branch,
|this| {
- this.end_slot(deleted_branch_icon(ix))
+ let is_remote = entry.as_branch().is_some_and(|branch| branch.is_remote());
+ this.end_slot(deleted_branch_icon(ix, is_remote))
.show_end_slot_on_hover()
},
)
@@ -2016,15 +2034,20 @@ impl PickerDelegate for BranchListDelegate {
}))
});
+ let selected_branch = selected_entry.and_then(|entry| entry.as_branch());
+ let delete_label = if selected_branch.is_some_and(|branch| branch.is_remote()) {
+ "Delete Local Tracking Branch"
+ } else {
+ "Delete"
+ };
+
let delete_and_select_btns = h_flex()
.gap_1()
.when(
- !selected_entry
- .and_then(|entry| entry.as_branch())
- .is_some_and(|branch| branch.is_head),
+ !selected_branch.is_some_and(|branch| branch.is_head),
|this| {
this.child(
- Button::new("delete-branch", "Delete")
+ Button::new("delete-branch", delete_label)
.key_binding(
KeyBinding::for_action_in(
&branch_picker::DeleteBranch,