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

Use "restore" more consistently in the git panel (#25780)

Browse source 
This PR replaces almost all uses of "discard" in the git panel UI with
"restore", since that's the verb we settled on for the project diff.

The only exception is in the confirmation prompt for restoring files,
where I've kept the "discard changes" language. I think consistency is
less important here and it's helpful to rephrase the action that's being
taken to emphasize that it's destructive.

Release Notes:

- N/A
This commit is contained in:
Cole Miller 2025-02-27 18:45:56 -05:00 • committed by GitHub
parent c0ecf8684e
commit 62fb555e18
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/git_ui/src/git_panel.rs
View file

@ -842,7 +842,7 @@ impl GitPanel {
.detach(); .detach();
} }
fn discard_tracked_changes( fn restore_tracked_files(
&mut self, &mut self,
_: &RestoreTrackedFiles, _: &RestoreTrackedFiles,
window: &mut Window, window: &mut Window,
@ -872,8 +872,8 @@ impl GitPanel {
#[derive(strum::EnumIter, strum::VariantNames)] #[derive(strum::EnumIter, strum::VariantNames)]
#[strum(serialize_all = "title_case")] #[strum(serialize_all = "title_case")]
enum DiscardCancel { enum RestoreCancel {
DiscardTrackedChanges, RestoreTrackedFiles,
Cancel, Cancel,
} }
let prompt = prompt( let prompt = prompt(
@ -884,7 +884,7 @@ impl GitPanel {
); );
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
match prompt.await { match prompt.await {
Ok(DiscardCancel::DiscardTrackedChanges) => { Ok(RestoreCancel::RestoreTrackedFiles) => {
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
let repo_paths = entries.into_iter().map(|entry| entry.repo_path).collect(); let repo_paths = entries.into_iter().map(|entry| entry.repo_path).collect();
this.perform_checkout(repo_paths, cx); this.perform_checkout(repo_paths, cx);
@ -2386,17 +2386,15 @@ impl GitPanel {
} else { } else {
"Stage File" "Stage File"
}; };
let revert_title = if entry.status.is_deleted() { let restore_title = if entry.status.is_created() {
"Restore file" "Trash File"
} else if entry.status.is_created() {
"Trash file"
} else { } else {
"Discard changes" "Restore File"
}; };
let context_menu = ContextMenu::build(window, cx, |context_menu, _, _| { let context_menu = ContextMenu::build(window, cx, |context_menu, _, _| {
context_menu context_menu
.action(stage_title, ToggleStaged.boxed_clone()) .action(stage_title, ToggleStaged.boxed_clone())
.action(revert_title, git::RestoreFile.boxed_clone()) .action(restore_title, git::RestoreFile.boxed_clone())
.separator() .separator()
.action("Open Diff", Confirm.boxed_clone()) .action("Open Diff", Confirm.boxed_clone())
.action("Open File", SecondaryConfirm.boxed_clone()) .action("Open File", SecondaryConfirm.boxed_clone())
@ -2413,7 +2411,7 @@ impl GitPanel {
.separator() .separator()
.action("Open Diff", project_diff::Diff.boxed_clone()) .action("Open Diff", project_diff::Diff.boxed_clone())
.separator() .separator()
.action("Discard Tracked Changes", RestoreTrackedFiles.boxed_clone()) .action("Restore Tracked Files", RestoreTrackedFiles.boxed_clone())
.action("Trash Untracked Files", TrashUntrackedFiles.boxed_clone()) .action("Trash Untracked Files", TrashUntrackedFiles.boxed_clone())
}) })
} }
@ -2697,7 +2695,7 @@ impl Render for GitPanel {
.on_action(cx.listener(Self::toggle_staged_for_selected)) .on_action(cx.listener(Self::toggle_staged_for_selected))
.on_action(cx.listener(Self::stage_all)) .on_action(cx.listener(Self::stage_all))
.on_action(cx.listener(Self::unstage_all)) .on_action(cx.listener(Self::unstage_all))
.on_action(cx.listener(Self::discard_tracked_changes)) .on_action(cx.listener(Self::restore_tracked_files))
.on_action(cx.listener(Self::clean_all)) .on_action(cx.listener(Self::clean_all))
.on_action(cx.listener(Self::fetch)) .on_action(cx.listener(Self::fetch))
.on_action(cx.listener(Self::pull)) .on_action(cx.listener(Self::pull))