mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reword

Browse source
This commit is contained in:
sxyazi 2026-03-20 15:46:12 +08:00
parent 662d5d5f8b
commit 4d7ff0cb0b
No known key found for this signature in database
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -27,7 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/):
- New `ind-app-title` DDS event to customize the app title ([#3684]) - New `ind-app-title` DDS event to customize the app title ([#3684])
- New `ind-hidden` and `key-hidden` DDS events to change hidden status in Lua ([#3748]) - New `ind-hidden` and `key-hidden` DDS events to change hidden status in Lua ([#3748])
- New `marker_symbol` option to specify the symbol used for marking files ([#3689]) - New `marker_symbol` option to specify the symbol used for marking files ([#3689])
- New `--discard` for `ya pkg` to discard any local changes made to packages ([#3781]) - New `--discard` for `ya pkg` that discard local changes made to packages ([#3781])
- New `fs.unique()` creates a unique file or directory ([#3677]) - New `fs.unique()` creates a unique file or directory ([#3677])
- New `download` DDS event fires when remote files are downloaded ([#3687]) - New `download` DDS event fires when remote files are downloaded ([#3687])
- New `ind-which-activate` DDS event to change the which component behavior ([#3608]) - New `ind-which-activate` DDS event to change the which component behavior ([#3608])

6
yazi-cli/src/args.rs
View file

@ -78,13 +78,13 @@ pub(super) enum CommandPkg {
/// Packages to delete. /// Packages to delete.
#[arg(index = 1, num_args = 1..)] #[arg(index = 1, num_args = 1..)]
ids: Vec<String>, ids: Vec<String>,
/// Discard any local changes made to packages. /// Discard local changes made to packages while deleting.
#[arg(long)] #[arg(long)]
discard: bool, discard: bool,
}, },
/// Install all packages. /// Install all packages.
Install { Install {
/// Discard any local changes made to packages. /// Discard local changes made to packages while installing.
#[arg(long)] #[arg(long)]
discard: bool, discard: bool,
}, },
@ -95,7 +95,7 @@ pub(super) enum CommandPkg {
/// Packages to upgrade, upgrade all if unspecified. /// Packages to upgrade, upgrade all if unspecified.
#[arg(index = 1, num_args = 0..)] #[arg(index = 1, num_args = 0..)]
ids: Vec<String>, ids: Vec<String>,
/// Discard any local changes made to packages. /// Discard local changes made to packages while upgrading.
#[arg(long)] #[arg(long)]
discard: bool, discard: bool,
}, },

2
yazi-cli/src/package/hash.rs
View file

@ -46,7 +46,7 @@ impl Dependency {
if self.hash != self.hash().await? { if self.hash != self.hash().await? {
bail!( bail!(
"You have modified the contents of the `{}` {}. For safety, the operation has been aborted. "You have modified the contents of the `{}` {}. For safety, the operation has been aborted.
Please manually delete it from `{}` and re-run the command, or add `--discard` to discard any local changes.", Please manually delete it from `{}` and re-run the command, or use `--discard` to discard those local changes.",
self.name, self.name,
if self.is_flavor { "flavor" } else { "plugin" }, if self.is_flavor { "flavor" } else { "plugin" },
self.target().display() self.target().display()