Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename the "AMOUNT" argument for jj prev and jj next to OFFSET #3443

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Rename the "AMOUNT" argument for jj prev and jj next to OFFSET #3443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cli/src/commands/next.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ use crate::ui::Ui;
#[derive(clap::Args, Clone, Debug)]
#[command(verbatim_doc_comment)]
pub(crate) struct NextArgs {
/// How many revisions to move forward. By default advances to the next
/// child.
/// How many revisions to move forward. Advances to the next child by
/// default.
#[arg(default_value = "1")]
amount: u64,
offset: u64,
/// Instead of creating a new working-copy commit on top of the target
/// commit (like `jj new`), edit the target commit directly (like `jj
/// edit`).
Expand Down Expand Up @@ -102,7 +102,7 @@ pub(crate) fn cmd_next(
args: &NextArgs,
) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?;
let amount = args.amount;
let offset = args.offset;
let current_wc_id = workspace_command
.get_wc_commit_id()
.ok_or_else(|| user_error("This command requires a working copy"))?;
Expand All @@ -123,7 +123,7 @@ pub(crate) fn cmd_next(
_ => return Err(user_error("Cannot run `jj next` on a merge commit")),
}
};
let descendant_expression = RevsetExpression::commit(start_id.clone()).descendants_at(amount);
let descendant_expression = RevsetExpression::commit(start_id.clone()).descendants_at(offset);
let target_expression = if edit {
descendant_expression
} else {
Expand All @@ -139,8 +139,8 @@ pub(crate) fn cmd_next(
[] => {
// We found no descendant.
return Err(user_error(format!(
"No descendant found {amount} commit{} forward",
if amount > 1 { "s" } else { "" }
"No descendant found {offset} commit{} forward",
if offset > 1 { "s" } else { "" }
)));
}
commits => choose_commit(ui, &workspace_command, "next", commits)?,
Expand Down
12 changes: 6 additions & 6 deletions cli/src/commands/prev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ use crate::ui::Ui;
#[derive(clap::Args, Clone, Debug)]
#[command(verbatim_doc_comment)]
pub(crate) struct PrevArgs {
/// How many revisions to move backward. By default moves to the parent.
/// How many revisions to move backward. Moves to the parent by default.
#[arg(default_value = "1")]
amount: u64,
offset: u64,
/// Edit the parent directly, instead of moving the working-copy commit.
#[arg(long)]
edit: bool,
Expand All @@ -67,7 +67,7 @@ pub(crate) fn cmd_prev(
args: &PrevArgs,
) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?;
let amount = args.amount;
let offset = args.offset;
let current_wc_id = workspace_command
.get_wc_commit_id()
.ok_or_else(|| user_error("This command requires a working copy"))?;
Expand All @@ -86,7 +86,7 @@ pub(crate) fn cmd_prev(
_ => return Err(user_error("Cannot run `jj prev` on a merge commit")),
}
};
let ancestor_expression = RevsetExpression::commit(start_id.clone()).ancestors_at(amount);
let ancestor_expression = RevsetExpression::commit(start_id.clone()).ancestors_at(offset);
let target_revset = if edit {
ancestor_expression
} else {
Expand All @@ -106,8 +106,8 @@ pub(crate) fn cmd_prev(
[target] => target,
[] => {
return Err(user_error(format!(
"No ancestor found {amount} commit{} back",
if amount > 1 { "s" } else { "" }
"No ancestor found {offset} commit{} back",
if offset > 1 { "s" } else { "" }
)))
}
commits => choose_commit(ui, &workspace_command, "prev", commits)?,
Expand Down
8 changes: 4 additions & 4 deletions cli/tests/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,11 +1172,11 @@ If your working-copy commit already has visible children, then `--edit` is
implied.
```

**Usage:** `jj next [OPTIONS] [AMOUNT]`
**Usage:** `jj next [OPTIONS] [OFFSET]`

###### **Arguments:**

* `<AMOUNT>` — How many revisions to move forward. By default advances to the next child
* `<OFFSET>` — How many revisions to move forward. Advances to the next child by default

Default value: `1`

Expand Down Expand Up @@ -1376,11 +1376,11 @@ If your working-copy commit already has visible children, then `--edit` is
implied.
```

**Usage:** `jj prev [OPTIONS] [AMOUNT]`
**Usage:** `jj prev [OPTIONS] [OFFSET]`

###### **Arguments:**

* `<AMOUNT>` — How many revisions to move backward. By default moves to the parent
* `<OFFSET>` — How many revisions to move backward. Moves to the parent by default

Default value: `1`

Expand Down