forked from mirrors/jj
cli: update docs URLs to point to https://martinvonz.github.io/jj/latest/
This commit is contained in:
parent
a0fae76622
commit
058249cc57
35 changed files with 76 additions and 76 deletions
|
@ -1339,7 +1339,7 @@ impl WorkspaceCommandHelper {
|
|||
short_operation_hash(&old_op_id)
|
||||
),
|
||||
"Run `jj workspace update-stale` to update it.
|
||||
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy \
|
||||
See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy \
|
||||
for more information.",
|
||||
));
|
||||
}
|
||||
|
@ -1355,7 +1355,7 @@ See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-workin
|
|||
return Err(user_error_with_hint(
|
||||
"Could not read working copy's operation.",
|
||||
"Run `jj workspace update-stale` to recover.
|
||||
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy \
|
||||
See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy \
|
||||
for more information.",
|
||||
));
|
||||
}
|
||||
|
@ -2492,7 +2492,7 @@ impl fmt::Display for RemoteBranchNamePattern {
|
|||
|
||||
/// Jujutsu (An experimental VCS)
|
||||
///
|
||||
/// To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/docs/tutorial.md.
|
||||
/// To get started, see the tutorial at https://martinvonz.github.io/jj/latest/tutorial/.
|
||||
#[allow(rustdoc::bare_urls)]
|
||||
#[derive(clap::Parser, Clone, Debug)]
|
||||
#[command(name = "jj")]
|
||||
|
|
|
@ -725,7 +725,7 @@ fn try_handle_command_result(
|
|||
print_error(ui, "Config error: ", err, hints)?;
|
||||
writeln!(
|
||||
ui.stderr_formatter().labeled("hint"),
|
||||
"For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md."
|
||||
"For help, see https://martinvonz.github.io/jj/latest/config/."
|
||||
)?;
|
||||
Ok(ExitCode::from(1))
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ pub struct BranchDeleteArgs {
|
|||
///
|
||||
/// By default, the specified name matches exactly. Use `glob:` prefix to
|
||||
/// select branches by wildcard pattern. For details, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
/// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
#[arg(required = true, value_parser = StringPattern::parse)]
|
||||
names: Vec<StringPattern>,
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ pub struct BranchForgetArgs {
|
|||
///
|
||||
/// By default, the specified name matches exactly. Use `glob:` prefix to
|
||||
/// select branches by wildcard pattern. For details, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
/// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
#[arg(required = true, value_parser = StringPattern::parse)]
|
||||
names: Vec<StringPattern>,
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ use crate::ui::Ui;
|
|||
/// "+".
|
||||
///
|
||||
/// For information about branches, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/branches.md.
|
||||
/// https://martinvonz.github.io/jj/latest/branches/.
|
||||
#[derive(clap::Args, Clone, Debug)]
|
||||
pub struct BranchListArgs {
|
||||
/// Show all tracking and non-tracking remote branches including the ones
|
||||
|
@ -55,7 +55,7 @@ pub struct BranchListArgs {
|
|||
///
|
||||
/// By default, the specified name matches exactly. Use `glob:` prefix to
|
||||
/// select branches by wildcard pattern. For details, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
/// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
#[arg(value_parser = StringPattern::parse)]
|
||||
names: Vec<StringPattern>,
|
||||
|
||||
|
@ -70,7 +70,7 @@ pub struct BranchListArgs {
|
|||
///
|
||||
/// All 0-argument methods of the `RefName` type are available as keywords.
|
||||
///
|
||||
/// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
/// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
#[arg(long, short = 'T')]
|
||||
template: Option<String>,
|
||||
}
|
||||
|
|
|
@ -59,7 +59,7 @@ use crate::ui::Ui;
|
|||
/// Manage branches
|
||||
///
|
||||
/// For information about branches, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/branches.md.
|
||||
/// https://martinvonz.github.io/jj/latest/branches/.
|
||||
#[derive(clap::Subcommand, Clone, Debug)]
|
||||
pub enum BranchCommand {
|
||||
#[command(visible_alias("c"))]
|
||||
|
|
|
@ -56,7 +56,7 @@ pub struct BranchMoveArgs {
|
|||
///
|
||||
/// By default, the specified name matches exactly. Use `glob:` prefix to
|
||||
/// select branches by wildcard pattern. For details, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
/// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
#[arg(group = "source", value_parser = StringPattern::parse)]
|
||||
names: Vec<StringPattern>,
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ pub struct BranchTrackArgs {
|
|||
///
|
||||
/// By default, the specified name matches exactly. Use `glob:` prefix to
|
||||
/// select branches by wildcard pattern. For details, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
/// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
///
|
||||
/// Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
|
||||
#[arg(required = true, value_name = "BRANCH@REMOTE")]
|
||||
|
|
|
@ -31,7 +31,7 @@ pub struct BranchUntrackArgs {
|
|||
///
|
||||
/// By default, the specified name matches exactly. Use `glob:` prefix to
|
||||
/// select branches by wildcard pattern. For details, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
/// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
///
|
||||
/// Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
|
||||
#[arg(required = true, value_name = "BRANCH@REMOTE")]
|
||||
|
|
|
@ -25,7 +25,7 @@ use crate::ui::Ui;
|
|||
/// `jj new`)
|
||||
///
|
||||
/// For more information, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/working-copy.md.
|
||||
/// https://martinvonz.github.io/jj/latest/working-copy/.
|
||||
#[derive(clap::Args, Clone, Debug)]
|
||||
pub(crate) struct CheckoutArgs {
|
||||
/// The revision to update to
|
||||
|
|
|
@ -49,7 +49,7 @@ pub struct ConfigListArgs {
|
|||
/// * `value: String`: Serialized value in TOML syntax.
|
||||
/// * `overridden: Boolean`: True if the value is shadowed by other.
|
||||
///
|
||||
/// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
/// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
#[arg(long, short = 'T', verbatim_doc_comment)]
|
||||
template: Option<String>,
|
||||
}
|
||||
|
|
|
@ -69,7 +69,7 @@ impl ConfigLevelArgs {
|
|||
/// environment variables.
|
||||
///
|
||||
/// For file locations, supported config options, and other details about jj
|
||||
/// config, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
/// config, see https://martinvonz.github.io/jj/latest/config/.
|
||||
#[derive(clap::Subcommand, Clone, Debug)]
|
||||
pub(crate) enum ConfigCommand {
|
||||
#[command(visible_alias("e"))]
|
||||
|
|
|
@ -57,7 +57,7 @@ pub(crate) struct EvologArgs {
|
|||
no_graph: bool,
|
||||
/// Render each revision using the given template
|
||||
///
|
||||
/// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
/// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
#[arg(long, short = 'T')]
|
||||
template: Option<String>,
|
||||
/// Show patch compared to the previous version of this change
|
||||
|
|
|
@ -50,7 +50,7 @@ use crate::ui::Ui;
|
|||
/// Commands for working with Git remotes and the underlying Git repo
|
||||
///
|
||||
/// For a comparison with Git, including a table of commands, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md.
|
||||
/// https://martinvonz.github.io/jj/latest/git-comparison/.
|
||||
#[derive(Subcommand, Clone, Debug)]
|
||||
pub enum GitCommand {
|
||||
Clone(GitCloneArgs),
|
||||
|
|
|
@ -72,7 +72,7 @@ pub(crate) struct LogArgs {
|
|||
no_graph: bool,
|
||||
/// Render each revision using the given template
|
||||
///
|
||||
/// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
/// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
#[arg(long, short = 'T')]
|
||||
template: Option<String>,
|
||||
/// Show patch
|
||||
|
|
|
@ -45,7 +45,7 @@ use crate::ui::Ui;
|
|||
/// `main` branch and the working copy as parents.
|
||||
///
|
||||
/// For more information, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/working-copy.md.
|
||||
/// https://martinvonz.github.io/jj/latest/working-copy/.
|
||||
#[derive(clap::Args, Clone, Debug)]
|
||||
pub(crate) struct NewArgs {
|
||||
/// Parent(s) of the new change
|
||||
|
|
|
@ -48,7 +48,7 @@ pub struct OperationLogArgs {
|
|||
no_graph: bool,
|
||||
/// Render each operation using the given template
|
||||
///
|
||||
/// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
/// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
#[arg(long, short = 'T')]
|
||||
template: Option<String>,
|
||||
}
|
||||
|
|
|
@ -40,7 +40,7 @@ use crate::ui::Ui;
|
|||
/// Commands for working with the operation log
|
||||
///
|
||||
/// For information about the operation log, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/operation-log.md.
|
||||
/// https://martinvonz.github.io/jj/latest/operation-log/.
|
||||
#[derive(Subcommand, Clone, Debug)]
|
||||
pub enum OperationCommand {
|
||||
Abandon(OperationAbandonArgs),
|
||||
|
|
|
@ -32,7 +32,7 @@ pub(crate) struct ShowArgs {
|
|||
unused_revision: bool,
|
||||
/// Render a revision using the given template
|
||||
///
|
||||
/// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
/// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
#[arg(long, short = 'T')]
|
||||
template: Option<String>,
|
||||
#[command(flatten)]
|
||||
|
|
|
@ -34,7 +34,7 @@ use crate::ui::Ui;
|
|||
/// * The working copy commit and its (first) parent, and a summary of the
|
||||
/// changes between them
|
||||
///
|
||||
/// * Conflicted branches (see https://github.com/martinvonz/jj/blob/main/docs/branches.md)
|
||||
/// * Conflicted branches (see https://martinvonz.github.io/jj/latest/branches/)
|
||||
#[derive(clap::Args, Clone, Debug)]
|
||||
#[command(visible_alias = "st")]
|
||||
pub(crate) struct StatusArgs {
|
||||
|
|
|
@ -34,14 +34,14 @@ pub struct TagListArgs {
|
|||
///
|
||||
/// By default, the specified name matches exactly. Use `glob:` prefix to
|
||||
/// select tags by wildcard pattern. For details, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
/// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
#[arg(value_parser = StringPattern::parse)]
|
||||
pub names: Vec<StringPattern>,
|
||||
/// Render each tag using the given template
|
||||
///
|
||||
/// All 0-argument methods of the `RefName` type are available as keywords.
|
||||
///
|
||||
/// For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
/// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
#[arg(long, short = 'T')]
|
||||
template: Option<String>,
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ use crate::ui::Ui;
|
|||
/// Update a workspace that has become stale
|
||||
///
|
||||
/// For information about stale working copies, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/working-copy.md.
|
||||
/// https://martinvonz.github.io/jj/latest/working-copy/.
|
||||
#[derive(clap::Args, Clone, Debug)]
|
||||
pub struct WorkspaceUpdateStaleArgs {}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"$schema": "http://json-schema.org/draft-07/schema",
|
||||
"title": "Jujutsu config",
|
||||
"type": "object",
|
||||
"description": "User configuration for Jujutsu VCS. See https://github.com/martinvonz/jj/blob/main/docs/config.md for details",
|
||||
"description": "User configuration for Jujutsu VCS. See https://martinvonz.github.io/jj/latest/config/ for details",
|
||||
"properties": {
|
||||
"user": {
|
||||
"type": "object",
|
||||
|
@ -125,7 +125,7 @@
|
|||
"description": "Options for rendering revision graphs from jj log etc",
|
||||
"properties": {
|
||||
"style": {
|
||||
"description": "Style of connectors/markings used to render the graph. See https://github.com/martinvonz/jj/blob/main/docs/config.md#graph-style",
|
||||
"description": "Style of connectors/markings used to render the graph. See https://martinvonz.github.io/jj/latest/config/#graph-style",
|
||||
"enum": [
|
||||
"curved",
|
||||
"square",
|
||||
|
@ -299,7 +299,7 @@
|
|||
"properties": {
|
||||
"auto-local-branch": {
|
||||
"type": "boolean",
|
||||
"description": "Whether jj creates a local branch with the same name when it imports a remote-tracking branch from git. See https://github.com/martinvonz/jj/blob/main/docs/config.md#automatic-local-branch-creation",
|
||||
"description": "Whether jj creates a local branch with the same name when it imports a remote-tracking branch from git. See https://martinvonz.github.io/jj/latest/config/#automatic-local-branch-creation",
|
||||
"default": false
|
||||
},
|
||||
"abandon-unreachable-commits": {
|
||||
|
@ -371,7 +371,7 @@
|
|||
},
|
||||
"merge-tool-edits-conflict-markers": {
|
||||
"type": "boolean",
|
||||
"description": "Whether to populate the output file with conflict markers before starting the merge tool. See https://github.com/martinvonz/jj/blob/main/docs/config.md#editing-conflict-markers-with-a-tool-or-a-text-editor",
|
||||
"description": "Whether to populate the output file with conflict markers before starting the merge tool. See https://martinvonz.github.io/jj/latest/config/#editing-conflict-markers-with-a-tool-or-a-text-editor",
|
||||
"default": false
|
||||
}
|
||||
}
|
||||
|
|
|
@ -210,7 +210,7 @@ pub struct AnnotatedValue {
|
|||
/// Sources from the lowest precedence:
|
||||
/// 1. Default
|
||||
/// 2. Base environment variables
|
||||
/// 3. [User config](https://github.com/martinvonz/jj/blob/main/docs/config.md#configuration)
|
||||
/// 3. [User config](https://martinvonz.github.io/jj/latest/config/)
|
||||
/// 4. Repo config `.jj/repo/config.toml`
|
||||
/// 5. TODO: Workspace config `.jj/config.toml`
|
||||
/// 6. Override environment variables
|
||||
|
|
|
@ -104,7 +104,7 @@ This document contains the help content for the `jj` command-line program.
|
|||
|
||||
Jujutsu (An experimental VCS)
|
||||
|
||||
To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/docs/tutorial.md.
|
||||
To get started, see the tutorial at https://martinvonz.github.io/jj/latest/tutorial/.
|
||||
|
||||
**Usage:** `jj [OPTIONS] [COMMAND]`
|
||||
|
||||
|
@ -229,7 +229,7 @@ Apply the reverse of a revision on top of another revision
|
|||
|
||||
Manage branches
|
||||
|
||||
For information about branches, see https://github.com/martinvonz/jj/blob/main/docs/branches.md.
|
||||
For information about branches, see https://martinvonz.github.io/jj/latest/branches/.
|
||||
|
||||
**Usage:** `jj branch <COMMAND>`
|
||||
|
||||
|
@ -273,7 +273,7 @@ Delete an existing branch and propagate the deletion to remotes on the next push
|
|||
|
||||
* `<NAMES>` — The branches to delete
|
||||
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
|
||||
|
||||
|
||||
|
@ -289,7 +289,7 @@ A forgotten branch will not impact remotes on future pushes. It will be recreate
|
|||
|
||||
* `<NAMES>` — The branches to forget
|
||||
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
|
||||
|
||||
|
||||
|
@ -299,7 +299,7 @@ List branches and their targets
|
|||
|
||||
By default, a tracking remote branch will be included only if its target is different from the local target. A non-tracking remote branch won't be listed. For a conflicted branch (both local and remote), old target revisions are preceded by a "-" and new target revisions are preceded by a "+".
|
||||
|
||||
For information about branches, see https://github.com/martinvonz/jj/blob/main/docs/branches.md.
|
||||
For information about branches, see https://martinvonz.github.io/jj/latest/branches/.
|
||||
|
||||
**Usage:** `jj branch list [OPTIONS] [NAMES]...`
|
||||
|
||||
|
@ -307,7 +307,7 @@ For information about branches, see https://github.com/martinvonz/jj/blob/main/d
|
|||
|
||||
* `<NAMES>` — Show branches whose local name matches
|
||||
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
|
||||
###### **Options:**
|
||||
|
||||
|
@ -321,7 +321,7 @@ For information about branches, see https://github.com/martinvonz/jj/blob/main/d
|
|||
|
||||
All 0-argument methods of the `RefName` type are available as keywords.
|
||||
|
||||
For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
|
||||
|
||||
|
||||
|
@ -343,7 +343,7 @@ $ jj branch move --from 'heads(::@- & branches())' --to @-
|
|||
|
||||
* `<NAMES>` — Move branches matching the given name patterns
|
||||
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
|
||||
###### **Options:**
|
||||
|
||||
|
@ -399,7 +399,7 @@ A tracking remote branch will be imported as a local branch of the same name. Ch
|
|||
|
||||
* `<BRANCH@REMOTE>` — Remote branches to track
|
||||
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
|
||||
Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
|
||||
|
||||
|
@ -417,7 +417,7 @@ A non-tracking remote branch is just a pointer to the last-fetched remote branch
|
|||
|
||||
* `<BRANCH@REMOTE>` — Remote branches to untrack
|
||||
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select branches by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
|
||||
Examples: branch@remote, glob:main@*, glob:jjfan-*@upstream
|
||||
|
||||
|
@ -454,7 +454,7 @@ Manage config options
|
|||
|
||||
Operates on jj configuration, which comes from the config file and environment variables.
|
||||
|
||||
For file locations, supported config options, and other details about jj config, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For file locations, supported config options, and other details about jj config, see https://martinvonz.github.io/jj/latest/config/.
|
||||
|
||||
**Usage:** `jj config <COMMAND>`
|
||||
|
||||
|
@ -527,7 +527,7 @@ List variables set in config file, along with their values
|
|||
* `value: String`: Serialized value in TOML syntax.
|
||||
* `overridden: Boolean`: True if the value is shadowed by other.
|
||||
|
||||
For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
|
||||
|
||||
|
||||
|
@ -709,7 +709,7 @@ Lists the previous commits which a change has pointed to. The current commit of
|
|||
* `--no-graph` — Don't show the graph, show a flat list of revisions
|
||||
* `-T`, `--template <TEMPLATE>` — Render each revision using the given template
|
||||
|
||||
For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
* `-p`, `--patch` — Show patch compared to the previous version of this change
|
||||
|
||||
If the previous version has different parents, it will be temporarily rebased to the parents of the new version, so the diff is not contaminated by unrelated changes.
|
||||
|
@ -907,7 +907,7 @@ will be removed in a future version.
|
|||
|
||||
Commands for working with Git remotes and the underlying Git repo
|
||||
|
||||
For a comparison with Git, including a table of commands, see https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md.
|
||||
For a comparison with Git, including a table of commands, see https://martinvonz.github.io/jj/latest/git-comparison/.
|
||||
|
||||
**Usage:** `jj git <COMMAND>`
|
||||
|
||||
|
@ -1192,7 +1192,7 @@ Spans of revisions that are not included in the graph per `--revisions` are rend
|
|||
* `--no-graph` — Don't show the graph, show a flat list of revisions
|
||||
* `-T`, `--template <TEMPLATE>` — Render each revision using the given template
|
||||
|
||||
For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
* `-p`, `--patch` — Show patch
|
||||
* `-s`, `--summary` — For each path, show only whether it was modified, added, or deleted
|
||||
* `--stat` — Show a histogram of the changes
|
||||
|
@ -1217,7 +1217,7 @@ By default, `jj` will edit the new change, making the working copy represent the
|
|||
|
||||
Note that you can create a merge commit by specifying multiple revisions as argument. For example, `jj new main @` will create a new commit with the `main` branch and the working copy as parents.
|
||||
|
||||
For more information, see https://github.com/martinvonz/jj/blob/main/docs/working-copy.md.
|
||||
For more information, see https://martinvonz.github.io/jj/latest/working-copy/.
|
||||
|
||||
**Usage:** `jj new [OPTIONS] [REVISIONS]...`
|
||||
|
||||
|
@ -1293,7 +1293,7 @@ implied.
|
|||
|
||||
Commands for working with the operation log
|
||||
|
||||
For information about the operation log, see https://github.com/martinvonz/jj/blob/main/docs/operation-log.md.
|
||||
For information about the operation log, see https://martinvonz.github.io/jj/latest/operation-log/.
|
||||
|
||||
**Usage:** `jj operation <COMMAND>`
|
||||
|
||||
|
@ -1370,7 +1370,7 @@ Like other commands, `jj op log` snapshots the current working-copy changes and
|
|||
* `--no-graph` — Don't show the graph, show a flat list of operations
|
||||
* `-T`, `--template <TEMPLATE>` — Render each operation using the given template
|
||||
|
||||
For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
|
||||
|
||||
|
||||
|
@ -1756,7 +1756,7 @@ Show commit description and changes in a revision
|
|||
|
||||
* `-T`, `--template <TEMPLATE>` — Render a revision using the given template
|
||||
|
||||
For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
* `-s`, `--summary` — For each path, show only whether it was modified, added, or deleted
|
||||
* `--stat` — Show a histogram of the changes
|
||||
* `--types` — For each path, show only its type before and after
|
||||
|
@ -1899,7 +1899,7 @@ This includes:
|
|||
|
||||
* The working copy commit and its (first) parent, and a summary of the changes between them
|
||||
|
||||
* Conflicted branches (see https://github.com/martinvonz/jj/blob/main/docs/branches.md)
|
||||
* Conflicted branches (see https://martinvonz.github.io/jj/latest/branches/)
|
||||
|
||||
**Usage:** `jj status [PATHS]...`
|
||||
|
||||
|
@ -1931,7 +1931,7 @@ List tags
|
|||
|
||||
* `<NAMES>` — Show tags whose local name matches
|
||||
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select tags by wildcard pattern. For details, see https://github.com/martinvonz/jj/blob/main/docs/revsets.md#string-patterns.
|
||||
By default, the specified name matches exactly. Use `glob:` prefix to select tags by wildcard pattern. For details, see https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
|
||||
|
||||
###### **Options:**
|
||||
|
||||
|
@ -1939,7 +1939,7 @@ List tags
|
|||
|
||||
All 0-argument methods of the `RefName` type are available as keywords.
|
||||
|
||||
For the syntax, see https://github.com/martinvonz/jj/blob/main/docs/templates.md
|
||||
For the syntax, see https://martinvonz.github.io/jj/latest/templates/
|
||||
|
||||
|
||||
|
||||
|
@ -2172,7 +2172,7 @@ Show the current workspace root directory
|
|||
|
||||
Update a workspace that has become stale
|
||||
|
||||
For information about stale working copies, see https://github.com/martinvonz/jj/blob/main/docs/working-copy.md.
|
||||
For information about stale working copies, see https://martinvonz.github.io/jj/latest/working-copy/.
|
||||
|
||||
**Usage:** `jj workspace update-stale`
|
||||
|
||||
|
|
|
@ -151,7 +151,7 @@ fn test_alias_calls_help() {
|
|||
insta::assert_snapshot!(stdout.lines().take(5).join("\n"), @r###"
|
||||
Jujutsu (An experimental VCS)
|
||||
|
||||
To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/docs/tutorial.md.
|
||||
To get started, see the tutorial at https://martinvonz.github.io/jj/latest/tutorial/.
|
||||
|
||||
Usage: jj [OPTIONS] <COMMAND>
|
||||
"###);
|
||||
|
|
|
@ -700,7 +700,7 @@ fn test_config_get() {
|
|||
let stdout = test_env.jj_cmd_failure(test_env.env_root(), &["config", "get", "nonexistent"]);
|
||||
insta::assert_snapshot!(stdout, @r###"
|
||||
Config error: configuration property "nonexistent" not found
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
|
||||
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["config", "get", "table.string"]);
|
||||
|
@ -716,13 +716,13 @@ fn test_config_get() {
|
|||
let stdout = test_env.jj_cmd_failure(test_env.env_root(), &["config", "get", "table.list"]);
|
||||
insta::assert_snapshot!(stdout, @r###"
|
||||
Config error: invalid type: sequence, expected a value convertible to a string
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
|
||||
let stdout = test_env.jj_cmd_failure(test_env.env_root(), &["config", "get", "table"]);
|
||||
insta::assert_snapshot!(stdout, @r###"
|
||||
Config error: invalid type: map, expected a value convertible to a string
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
|
||||
let stdout =
|
||||
|
@ -776,7 +776,7 @@ fn test_config_path_syntax() {
|
|||
let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["config", "get", "a.'b()'.x"]);
|
||||
insta::assert_snapshot!(stderr, @r###"
|
||||
Config error: configuration property "a.'b()'.x" not found
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
|
||||
// "-" and "_" are valid TOML keys
|
||||
|
@ -853,7 +853,7 @@ fn test_config_show_paths() {
|
|||
Caused by: enum PaginationChoice does not have variant constructor :builtin
|
||||
Hint: Check the following config files:
|
||||
- $TEST_ENV/config/config.toml
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
}
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ fn test_config_no_tools() {
|
|||
let stderr = test_env.jj_cmd_failure(&repo_path, &["fix"]);
|
||||
insta::assert_snapshot!(stderr, @r###"
|
||||
Config error: At least one entry of `fix.tools` or `fix.tool-command` is required.
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
|
||||
let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "file", "-r", "@"]);
|
||||
|
@ -177,12 +177,12 @@ fn test_config_multiple_tools_with_same_name() {
|
|||
#[cfg(unix)]
|
||||
insta::assert_snapshot!(stderr, @r###"
|
||||
Config error: redefinition of table `fix.tools.my-tool` for key `fix.tools.my-tool` at line 6 column 9 in ../config/config0002.toml
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
#[cfg(windows)]
|
||||
insta::assert_snapshot!(stderr, @r###"
|
||||
Config error: redefinition of table `fix.tools.my-tool` for key `fix.tools.my-tool` at line 6 column 9 in ..\config\config0002.toml
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
|
||||
test_env.set_config_path("/dev/null".into());
|
||||
|
@ -258,7 +258,7 @@ fn test_config_tables_all_commands_missing() {
|
|||
let stderr = test_env.jj_cmd_failure(&repo_path, &["fix"]);
|
||||
insta::assert_snapshot!(stderr, @r###"
|
||||
Config error: missing field `command`
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
|
||||
let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "foo", "-r", "@"]);
|
||||
|
@ -290,7 +290,7 @@ fn test_config_tables_some_commands_missing() {
|
|||
let stderr = test_env.jj_cmd_failure(&repo_path, &["fix"]);
|
||||
insta::assert_snapshot!(stderr, @r###"
|
||||
Config error: missing field `command`
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
|
||||
let content = test_env.jj_cmd_success(&repo_path, &["file", "show", "foo", "-r", "@"]);
|
||||
|
|
|
@ -478,7 +478,7 @@ fn test_git_clone_ignore_working_copy() {
|
|||
insta::assert_snapshot!(stderr, @r###"
|
||||
Error: The working copy is stale (not updated since operation b51416386f26).
|
||||
Hint: Run `jj workspace update-stale` to update it.
|
||||
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy for more information.
|
||||
See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy for more information.
|
||||
"###);
|
||||
}
|
||||
|
||||
|
|
|
@ -549,7 +549,7 @@ fn test_invalid_config() {
|
|||
let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["init", "repo"]);
|
||||
insta::assert_snapshot!(stderr.replace('\\', "/"), @r###"
|
||||
Config error: expected newline, found an identifier at line 1 column 10 in config/config0002.toml
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
}
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ fn test_rewrite_immutable_generic() {
|
|||
insta::assert_snapshot!(stderr, @r###"
|
||||
Config error: Invalid `revset-aliases.immutable_heads()`
|
||||
Caused by: Revision "branch_that_does_not_exist" doesn't exist
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
|
||||
// Can use --ignore-immutable to override
|
||||
|
|
|
@ -456,7 +456,7 @@ fn test_log_bad_short_prefixes() {
|
|||
| ^---
|
||||
|
|
||||
= expected <identifier> or <expression>
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
}
|
||||
|
||||
|
|
|
@ -626,7 +626,7 @@ fn test_all_modifier() {
|
|||
| ^-^
|
||||
|
|
||||
= Modifier "all:" is not allowed in sub expression
|
||||
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
||||
For help, see https://martinvonz.github.io/jj/latest/config/.
|
||||
"###);
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ fn test_util_config_schema() {
|
|||
"$schema": "http://json-schema.org/draft-07/schema",
|
||||
"title": "Jujutsu config",
|
||||
"type": "object",
|
||||
"description": "User configuration for Jujutsu VCS. See https://github.com/martinvonz/jj/blob/main/docs/config.md for details",
|
||||
"description": "User configuration for Jujutsu VCS. See https://martinvonz.github.io/jj/latest/config/ for details",
|
||||
"properties": {
|
||||
[...]
|
||||
"fix": {
|
||||
|
|
|
@ -476,14 +476,14 @@ fn test_workspaces_conflicting_edits() {
|
|||
insta::assert_snapshot!(stderr, @r###"
|
||||
Error: The working copy is stale (not updated since operation 0da24da631e3).
|
||||
Hint: Run `jj workspace update-stale` to update it.
|
||||
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy for more information.
|
||||
See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy for more information.
|
||||
"###);
|
||||
// Same error on second run, and from another command
|
||||
let stderr = test_env.jj_cmd_failure(&secondary_path, &["log"]);
|
||||
insta::assert_snapshot!(stderr, @r###"
|
||||
Error: The working copy is stale (not updated since operation 0da24da631e3).
|
||||
Hint: Run `jj workspace update-stale` to update it.
|
||||
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy for more information.
|
||||
See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy for more information.
|
||||
"###);
|
||||
let (stdout, stderr) = test_env.jj_cmd_ok(&secondary_path, &["workspace", "update-stale"]);
|
||||
// It was detected that the working copy is now stale.
|
||||
|
@ -563,7 +563,7 @@ fn test_workspaces_updated_by_other() {
|
|||
insta::assert_snapshot!(stderr, @r###"
|
||||
Error: The working copy is stale (not updated since operation 0da24da631e3).
|
||||
Hint: Run `jj workspace update-stale` to update it.
|
||||
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy for more information.
|
||||
See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy for more information.
|
||||
"###);
|
||||
let (stdout, stderr) = test_env.jj_cmd_ok(&secondary_path, &["workspace", "update-stale"]);
|
||||
// It was detected that the working copy is now stale, but clean. So no
|
||||
|
@ -660,7 +660,7 @@ fn test_workspaces_current_op_discarded_by_other() {
|
|||
insta::assert_snapshot!(stderr, @r###"
|
||||
Error: Could not read working copy's operation.
|
||||
Hint: Run `jj workspace update-stale` to recover.
|
||||
See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-working-copy for more information.
|
||||
See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy for more information.
|
||||
"###);
|
||||
|
||||
let (stdout, stderr) = test_env.jj_cmd_ok(&secondary_path, &["workspace", "update-stale"]);
|
||||
|
|
Loading…
Reference in a new issue