Rename "Delete all local branches" to "Delete unused local branches"

Only branches that are not checked out will get deleted, so it makes more sense to name it "Delete unused local branches"

Author: pol-rivero

app/src/models/popup.ts

@@ -32,7 +32,7 @@ import { WorktreeEntry } from './worktree'
 export enum PopupType {
   RenameBranch = 'RenameBranch',
   DeleteBranch = 'DeleteBranch',
-  DeleteAllLocalBranches = 'DeleteAllLocalBranches',
+  DeleteUnusedLocalBranches = 'DeleteUnusedLocalBranches',
   DeleteRemoteBranch = 'DeleteRemoteBranch',
   ConfirmDiscardChanges = 'ConfirmDiscardChanges',
   Preferences = 'Preferences',
@@ -160,7 +160,7 @@ export type PopupDetail =
       existsOnRemote: boolean
     }
   | {
-      type: PopupType.DeleteAllLocalBranches
+      type: PopupType.DeleteUnusedLocalBranches
       repository: Repository
       branches: ReadonlyArray<Branch>
     }

app/src/ui/app.tsx

@@ -51,7 +51,7 @@ import {
   CantDeleteCurrentBranch,
   CantDeleteCurrentBranchUncommittedChanges,
   DeleteBranch,
-  DeleteAllLocalBranches,
+  DeleteUnusedLocalBranches,
   DeleteRemoteBranch,
 } from './delete-branch'
 import { CantDeleteMainBranch } from './delete-branch/cant-delete-main-branch'
@@ -1742,10 +1742,10 @@ export class App extends React.Component<IAppProps, IAppState> {
             onDeleted={this.onBranchDeleted}
           />
         )
-      case PopupType.DeleteAllLocalBranches:
+      case PopupType.DeleteUnusedLocalBranches:
         return (
-          <DeleteAllLocalBranches
-            key="delete-all-local-branches"
+          <DeleteUnusedLocalBranches
+            key="delete-unused-local-branches"
             dispatcher={this.props.dispatcher}
             repository={popup.repository}
             branches={popup.branches}

app/src/ui/branches/branch-list-item-context-menu.tsx

@@ -12,7 +12,7 @@ interface IBranchContextMenuConfig {
   onViewPullRequestOnGitHub?: () => void
   onSetAsDefaultBranch?: (branchName: string) => void
   onDeleteBranch?: (branchName: string) => void
-  onDeleteAllLocalBranches?: () => void
+  onDeleteUnusedLocalBranches?: () => void
   onPullSingleBranch?: (branchName: string) => void
   onCheckoutInNewWorktree?: (branch: Branch) => void
 }
@@ -28,7 +28,7 @@ export function generateBranchContextMenuItems(
     onViewPullRequestOnGitHub,
     onSetAsDefaultBranch,
     onDeleteBranch,
-    onDeleteAllLocalBranches,
+    onDeleteUnusedLocalBranches,
     onPullSingleBranch,
     onCheckoutInNewWorktree,
   } = config
@@ -94,12 +94,12 @@ export function generateBranchContextMenuItems(
     })
   }
 
-  if (onDeleteAllLocalBranches !== undefined) {
+  if (onDeleteUnusedLocalBranches !== undefined) {
     items.push({
       label: __DARWIN__
-        ? 'Delete All Local Branches…'
-        : 'Delete all local branches…',
-      action: () => onDeleteAllLocalBranches(),
+        ? 'Delete Unused Local Branches…'
+        : 'Delete unused local branches…',
+      action: () => onDeleteUnusedLocalBranches(),
     })
   }
 

app/src/ui/branches/branch-list.tsx

@@ -147,11 +147,11 @@ interface IBranchListProps {
   readonly onDeleteBranch?: (branchName: string) => void
 
   /**
-   * Optional: Callback for if the "delete all local branches" context menu
+   * Optional: Callback for if the "delete unused local branches" context menu
    * should exist. It is only shown when the right-clicked branch is local-only
    * and the repository has at least three local-only branches.
    */
-  readonly onDeleteAllLocalBranches?: () => void
+  readonly onDeleteUnusedLocalBranches?: () => void
 
   /** Optional: Callback to checkout a branch in a new worktree */
   readonly onCheckoutInNewWorktree?: (branch: Branch) => void
@@ -251,7 +251,7 @@ export class BranchList extends React.Component<IBranchListProps> {
     const {
       onRenameBranch,
       onDeleteBranch,
-      onDeleteAllLocalBranches,
+      onDeleteUnusedLocalBranches: onDeleteUnusedLocalBranches,
       onCheckoutInNewWorktree,
       onSetAsDefaultBranch,
       onPullSingleBranch,
@@ -268,12 +268,12 @@ export class BranchList extends React.Component<IBranchListProps> {
 
     const { branch } = item
 
-    // Only offer "delete all local branches" when right-clicking a local-only
+    // Only offer "delete unused local branches" when right-clicking a local-only
     // branch and the repository has at least three local-only branches.
     const localOnlyBranchCount =
       this.props.allBranches.filter(isLocalOnlyBranch).length
-    const canDeleteAllLocalBranches =
-      onDeleteAllLocalBranches !== undefined &&
+    const canDeleteUnusedLocalBranches =
+      onDeleteUnusedLocalBranches !== undefined &&
       isLocalOnlyBranch(branch) &&
       localOnlyBranchCount >= 3
 
@@ -286,8 +286,8 @@ export class BranchList extends React.Component<IBranchListProps> {
           ? undefined
           : onSetAsDefaultBranch,
       onDeleteBranch,
-      onDeleteAllLocalBranches: canDeleteAllLocalBranches
-        ? onDeleteAllLocalBranches
+      onDeleteUnusedLocalBranches: canDeleteUnusedLocalBranches
+        ? onDeleteUnusedLocalBranches
         : undefined,
       onPullSingleBranch,
       onCheckoutInNewWorktree,

app/src/ui/branches/branches-container.tsx

@@ -54,7 +54,7 @@ interface IBranchesContainerProps {
   readonly onRenameBranch: (branchName: string) => void
   readonly onSetAsDefaultBranch: (branchName: string) => void
   readonly onDeleteBranch: (branchName: string) => void
-  readonly onDeleteAllLocalBranches: () => void
+  readonly onDeleteUnusedLocalBranches: () => void
   readonly onCheckoutInNewWorktree?: (branch: Branch) => void
 
   /** Optional callback to checkout a PR in a new worktree */
@@ -299,7 +299,7 @@ export class BranchesContainer extends React.Component<
             onRenameBranch={this.props.onRenameBranch}
             onSetAsDefaultBranch={this.props.onSetAsDefaultBranch}
             onDeleteBranch={this.props.onDeleteBranch}
-            onDeleteAllLocalBranches={this.props.onDeleteAllLocalBranches}
+            onDeleteUnusedLocalBranches={this.props.onDeleteUnusedLocalBranches}
             onPullSingleBranch={this.props.onPullSingleBranch}
             onCheckoutInNewWorktree={
               enableWorktreeSupport()

…nch/delete-all-local-branches-dialog.tsx …/delete-unused-local-branches-dialog.tsxapp/src/ui/delete-branch/delete-all-local-branches-dialog.tsx renamed to app/src/ui/delete-branch/delete-unused-local-branches-dialog.tsx app/src/ui/delete-branch/delete-all-local-branches-dialog.tsx renamed to app/src/ui/delete-branch/delete-unused-local-branches-dialog.tsx

@@ -7,23 +7,23 @@ import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import { Ref } from '../lib/ref'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 
-interface IDeleteAllLocalBranchesProps {
+interface IDeleteUnusedLocalBranchesProps {
   readonly dispatcher: Dispatcher
   readonly repository: Repository
   readonly branches: ReadonlyArray<Branch>
   readonly onDismissed: () => void
   readonly onDeleted: (repository: Repository) => void
 }
 
-interface IDeleteAllLocalBranchesState {
+interface IDeleteUnusedLocalBranchesState {
   readonly isDeleting: boolean
 }
 
-export class DeleteAllLocalBranches extends React.Component<
-  IDeleteAllLocalBranchesProps,
-  IDeleteAllLocalBranchesState
+export class DeleteUnusedLocalBranches extends React.Component<
+  IDeleteUnusedLocalBranchesProps,
+  IDeleteUnusedLocalBranchesState
 > {
-  public constructor(props: IDeleteAllLocalBranchesProps) {
+  public constructor(props: IDeleteUnusedLocalBranchesProps) {
     super(props)
 
     this.state = {
@@ -36,25 +36,27 @@ export class DeleteAllLocalBranches extends React.Component<
 
     return (
       <Dialog
-        id="delete-all-local-branches"
+        id="delete-unused-local-branches"
         title={
-          __DARWIN__ ? 'Delete All Local Branches' : 'Delete all local branches'
+          __DARWIN__
+            ? 'Delete Unused Local Branches'
+            : 'Delete unused local branches'
         }
         type="warning"
         onSubmit={this.deleteBranches}
         onDismissed={this.props.onDismissed}
         disabled={this.state.isDeleting}
         loading={this.state.isDeleting}
         role="alertdialog"
-        ariaDescribedBy="delete-all-local-branches-message"
+        ariaDescribedBy="delete-unused-local-branches-message"
       >
         <DialogContent>
-          <div id="delete-all-local-branches-message">
+          <div id="delete-unused-local-branches-message">
             <p>
               Delete the following {count}{' '}
               {count === 1 ? 'local branch' : 'local branches'}?
             </p>
-            <ul className="delete-all-local-branches-list">
+            <ul className="delete-unused-local-branches-list">
               {this.props.branches.map(branch => (
                 <li key={branch.name}>
                   <Ref>{branch.name}</Ref>

app/src/ui/delete-branch/index.ts

@@ -1,5 +1,5 @@
 export { DeleteBranch } from './delete-branch-dialog'
-export { DeleteAllLocalBranches } from './delete-all-local-branches-dialog'
+export { DeleteUnusedLocalBranches } from './delete-unused-local-branches-dialog'
 export { DeleteRemoteBranch } from './delete-remote-branch-dialog'
 export { CantDeleteCurrentBranch } from './cant-delete-current-branch-dialog'
 export { CantDeleteCurrentBranchUncommittedChanges } from './cant-delete-current-branch-uncommitted-changes-dialog'

app/src/ui/toolbar/branch-dropdown.tsx

@@ -121,7 +121,7 @@ export class BranchDropdown extends React.Component<IBranchDropdownProps> {
         branchSortOrder={this.props.branchSortOrder}
         emoji={this.props.emoji}
         onDeleteBranch={this.onDeleteBranch}
-        onDeleteAllLocalBranches={this.onDeleteAllLocalBranches}
+        onDeleteUnusedLocalBranches={this.onDeleteUnusedLocalBranches}
         onPullSingleBranch={this.onPullSingleBranch}
         onRenameBranch={this.onRenameBranch}
         onSetAsDefaultBranch={this.onSetAsDefaultBranch}
@@ -448,7 +448,7 @@ export class BranchDropdown extends React.Component<IBranchDropdownProps> {
     })
   }
 
-  private onDeleteAllLocalBranches = () => {
+  private onDeleteUnusedLocalBranches = () => {
     const { dispatcher, repository, repositoryState } = this.props
     const { allBranches } = repositoryState.branchesState
     const worktrees = repositoryState.worktrees
@@ -464,7 +464,7 @@ export class BranchDropdown extends React.Component<IBranchDropdownProps> {
     }
 
     dispatcher.showPopup({
-      type: PopupType.DeleteAllLocalBranches,
+      type: PopupType.DeleteUnusedLocalBranches,
       repository,
       branches,
     })

app/styles/_ui.scss

@@ -54,7 +54,7 @@
 @import 'ui/banners';
 @import 'ui/add-repository';
 @import 'ui/discard-changes';
-@import 'ui/delete-all-local-branches';
+@import 'ui/delete-unused-local-branches';
 @import 'ui/filter-list';
 @import 'ui/missing-repository-view';
 @import 'ui/horizontal-rule';

…tyles/ui/_delete-all-local-branches.scss …es/ui/_delete-unused-local-branches.scssapp/styles/ui/_delete-all-local-branches.scss renamed to app/styles/ui/_delete-unused-local-branches.scss app/styles/ui/_delete-all-local-branches.scss renamed to app/styles/ui/_delete-unused-local-branches.scss

@@ -1,5 +1,5 @@
-#delete-all-local-branches {
-  .delete-all-local-branches-list {
+#delete-unused-local-branches {
+  .delete-unused-local-branches-list {
     max-height: 175px;
     overflow-y: auto;
     list-style: none;