From c426ff31d4a560f89e269711eb8c132b16d535b0 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Mon, 24 Jun 2024 20:35:09 -0700 Subject: [PATCH 1/2] docs: replace `jj files` -> `jj file list` `jj files` is now deprecated --- cli/src/cli_util.rs | 4 ++-- cli/tests/cli-reference@.md.snap | 2 +- docs/filesets.md | 2 +- docs/git-comparison.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/src/cli_util.rs b/cli/src/cli_util.rs index a72e89e9ff..d33142d5da 100644 --- a/cli/src/cli_util.rs +++ b/cli/src/cli_util.rs @@ -2391,8 +2391,8 @@ pub struct EarlyArgs { pub color: Option, /// Silence non-primary command output /// - /// For example, `jj files` will still list files, but it won't tell you if - /// the working copy was snapshotted or if descendants were rebased. + /// For example, `jj file list ` will still list files, but it won't tell + /// you if the working copy was snapshotted or if descendants were rebased. /// /// Warnings and errors will still be printed. #[arg(long, global = true, action = ArgAction::SetTrue)] diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap index 431229e56a..97e608f968 100644 --- a/cli/tests/cli-reference@.md.snap +++ b/cli/tests/cli-reference@.md.snap @@ -177,7 +177,7 @@ To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/d * `--color ` — When to colorize output (always, never, debug, auto) * `--quiet` — Silence non-primary command output - For example, `jj files` will still list files, but it won't tell you if the working copy was snapshotted or if descendants were rebased. + For example, `jj file list ` will still list files, but it won't tell you if the working copy was snapshotted or if descendants were rebased. Warnings and errors will still be printed. * `--no-pager` — Disable the pager diff --git a/docs/filesets.md b/docs/filesets.md index 9735a87903..567aec0b1c 100644 --- a/docs/filesets.md +++ b/docs/filesets.md @@ -74,7 +74,7 @@ jj diff '~Cargo.lock' List files in `src` excluding Rust sources. ``` -jj files 'src ~ glob:"**/*.rs"' +jj file list 'src ~ glob:"**/*.rs"' ``` Split a revision in two, putting `foo` into the second commit. diff --git a/docs/git-comparison.md b/docs/git-comparison.md index dbda867610..03c17af100 100644 --- a/docs/git-comparison.md +++ b/docs/git-comparison.md @@ -196,7 +196,7 @@ parent. Search among files versioned in the repository - grep foo $(jj files), or rg --no-require-git foo + grep foo $(jj file list), or rg --no-require-git foo git grep foo From 14e4d19c9c03c44359b3711561f18e70b491bced Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Mon, 24 Jun 2024 20:39:29 -0700 Subject: [PATCH 2/2] docs: replace `jj chmod` -> `jj file chmod` `jj chmod` is now deprecated --- cli/src/commands/file/chmod.rs | 4 ++-- cli/tests/cli-reference@.md.snap | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/src/commands/file/chmod.rs b/cli/src/commands/file/chmod.rs index 77c97d9bc8..8310a5c221 100644 --- a/cli/src/commands/file/chmod.rs +++ b/cli/src/commands/file/chmod.rs @@ -34,8 +34,8 @@ enum ChmodMode { /// Sets or removes the executable bit for paths in the repo /// -/// Unlike the POSIX `chmod`, `jj chmod` also works on Windows, on conflicted -/// files, and on arbitrary revisions. +/// Unlike the POSIX `chmod`, `jj file chmod` also works on Windows, on +/// conflicted files, and on arbitrary revisions. #[derive(clap::Args, Clone, Debug)] pub(crate) struct ChmodArgs { mode: ChmodMode, diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap index 97e608f968..dd045bbd26 100644 --- a/cli/tests/cli-reference@.md.snap +++ b/cli/tests/cli-reference@.md.snap @@ -698,7 +698,7 @@ File operations Sets or removes the executable bit for paths in the repo -Unlike the POSIX `chmod`, `jj chmod` also works on Windows, on conflicted files, and on arbitrary revisions. +Unlike the POSIX `chmod`, `jj file chmod` also works on Windows, on conflicted files, and on arbitrary revisions. **Usage:** `jj file chmod [OPTIONS] ...`