docs/cli: update URLs to from martinvonz user to jj-vcs org

We just migrated to the jj-vcs GitHub org, so we should point to the
new GitHub URLs.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,7 @@ assignees: ''
 ## Description
 
 <!-- Thanks for your report! Please describe your problem or request here.
-For questions, use https://github.com/martinvonz/jj/discussions/new instead.
+For questions, use https://github.com/jj-vcs/jj/discussions/new instead.
 Feel free to remove any of the sections below if they don't seem useful. -->
 
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,7 +5,7 @@ each commit representing one logical change. Address code review comments by
 rewriting the commits rather than adding commits on top. Use force-push when
 pushing the updated commits (`jj git push` does that automatically when you
 rewrite commits). Merge the PR at will once it's been approved. See
-https://github.com/martinvonz/jj/blob/main/docs/contributing.md for details.
+https://github.com/jj-vcs/jj/blob/main/docs/contributing.md for details.
 Note that you need to sign Google's CLA to contribute.
 -->
 

.github/scripts/docs-build-deploy

@@ -2,7 +2,7 @@
 # Set up a virtual environment with the required tools, build, and deploy the docs.
 #
 # Run from the root directory of the project as
-# .github/scripts/docs-build-deploy 'https://martinvonz.github.io' prerelease main
+# .github/scripts/docs-build-deploy 'https://jj-vcs.github.io' prerelease main
 # All arguments after the first are passed to `mike deploy`, run
 # `uv run -- mike deploy --help` for options. Note that `mike deploy`
 # creates a commit directly on the `gh-pages` branch.

.github/workflows/docs.yml

@@ -30,6 +30,6 @@ jobs:
         run: |
           git config user.name 'jj-docs[bot]'
           git config user.email 'jj-docs[bot]@users.noreply.github.io'
-          .github/scripts/docs-build-deploy 'https://martinvonz.github.io/jj' prerelease --push
+          .github/scripts/docs-build-deploy 'https://jj-vcs.github.io/jj' prerelease --push
       - name: "Show `git diff --stat`"
         run: git diff --stat gh-pages^ gh-pages || echo "(No diffs)"

.github/workflows/release.yml

@@ -141,6 +141,6 @@ jobs:
           git config user.email 'jj-docs[bot]@users.noreply.github.io'
           # Using the 'latest' tag below makes the website default
           # to this version.
-          .github/scripts/docs-build-deploy 'https://martinvonz.github.io/jj' "${{ github.event.release.tag_name }}" latest --update-aliases --push
+          .github/scripts/docs-build-deploy 'https://jj-vcs.github.io/jj' "${{ github.event.release.tag_name }}" latest --update-aliases --push
       - name: "Show `git diff --stat`"
         run: git diff --stat gh-pages^ gh-pages || echo "(No diffs)"

Cargo.toml

@@ -10,9 +10,9 @@ license = "Apache-2.0"
 rust-version = "1.76" # NOTE: remember to update CI, contributing.md, changelog.md, install-and-setup.md, and flake.nix
 edition = "2021"
 readme = "README.md"
-homepage = "https://github.com/martinvonz/jj"
-repository = "https://github.com/martinvonz/jj"
-documentation = "https://martinvonz.github.io/jj/"
+homepage = "https://github.com/jj-vcs/jj"
+repository = "https://github.com/jj-vcs/jj"
+documentation = "https://jj-vcs.github.io/jj/"
 categories = ["version-control", "development-tools"]
 keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
 

README.md

@@ -15,10 +15,10 @@
 **[Development Roadmap]   •  **
 **[Contributing](#contributing)**
 
-[Homepage]: https://martinvonz.github.io/jj
-[Installation]: https://martinvonz.github.io/jj/latest/install-and-setup
-[Getting Started]: https://martinvonz.github.io/jj/latest/tutorial
-[Development Roadmap]: https://martinvonz.github.io/jj/latest/roadmap
+[Homepage]: https://jj-vcs.github.io/jj
+[Installation]: https://jj-vcs.github.io/jj/latest/install-and-setup
+[Getting Started]: https://jj-vcs.github.io/jj/latest/tutorial
+[Development Roadmap]: https://jj-vcs.github.io/jj/latest/roadmap
 
 </div>
 
@@ -68,10 +68,10 @@ systems into a single tool. Some of those sources of inspiration include:
   theory of patches, as opposed to snapshots), the effect is that many forms of
   conflict resolution can be performed and propagated automatically.
 
-[perf]: https://github.com/martinvonz/jj/discussions/49
-[revset]: https://martinvonz.github.io/jj/latest/revsets/
-[no-index]: https://martinvonz.github.io/jj/latest/git-comparison/#the-index
-[conflicts]: https://martinvonz.github.io/jj/latest/conflicts/
+[perf]: https://github.com/jj-vcs/jj/discussions/49
+[revset]: https://jj-vcs.github.io/jj/latest/revsets/
+[no-index]: https://jj-vcs.github.io/jj/latest/git-comparison/#the-index
+[conflicts]: https://jj-vcs.github.io/jj/latest/conflicts/
 
 And it adds several innovative, useful features of its own:
 
@@ -116,9 +116,9 @@ And it adds several innovative, useful features of its own:
   _should_ happen is that it will expose conflicts between the local and remote
   state, leaving you to resolve them.
 
-[wcc]: https://martinvonz.github.io/jj/latest/working-copy/
+[wcc]: https://jj-vcs.github.io/jj/latest/working-copy/
 [undo-history]: https://en.wikipedia.org/wiki/Undo#History
-[conc-safety]: https://martinvonz.github.io/jj/latest/technical/concurrency/
+[conc-safety]: https://jj-vcs.github.io/jj/latest/technical/concurrency/
 
 The command-line tool is called `jj` for now because it's easy to type and easy
 to replace (rare in English). The project is called "Jujutsu" because it matches
@@ -127,7 +127,7 @@ to replace (rare in English). The project is called "Jujutsu" because it matches
 Jujutsu is relatively young, with lots of work to still be done. If you have any
 questions, or want to talk about future plans, please join us on Discord
 [![Discord](https://img.shields.io/discord/968932220549103686.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/dkmfj3aGQN),
-start a [GitHub Discussion](https://github.com/martinvonz/jj/discussions), or
+start a [GitHub Discussion](https://github.com/jj-vcs/jj/discussions), or
 send an IRC message to [`#jujutsu` on Libera
 Chat](https://web.libera.chat/?channel=#jujutsu). The developers monitor all of
 these channels[^bridge].
@@ -165,7 +165,7 @@ The wiki also contains a more extensive list of [media references][wiki-media].
 [lwn]: https://lwn.net/Articles/958468/
 [merge-talk]: https://www.youtube.com/watch?v=bx_LGilOuE4
 [merge-slides]: https://docs.google.com/presentation/d/1F8j9_UOOSGUN9MvHxPZX_L4bQ9NMcYOp1isn17kTC_M/view
-[wiki-media]: https://github.com/martinvonz/jj/wiki/Media
+[wiki-media]: https://github.com/jj-vcs/jj/wiki/Media
 
 ## Getting started
 
@@ -176,23 +176,23 @@ The wiki also contains a more extensive list of [media references][wiki-media].
 > it unusable for your particular use.
 
 Follow the [installation
-instructions](https://martinvonz.github.io/jj/latest/install-and-setup) to
+instructions](https://jj-vcs.github.io/jj/latest/install-and-setup) to
 obtain and configure `jj`.
 
 The best way to get started is probably to go through [the
-tutorial](https://martinvonz.github.io/jj/latest/tutorial). Also see the [Git
-comparison](https://martinvonz.github.io/jj/latest/git-comparison), which
+tutorial](https://jj-vcs.github.io/jj/latest/tutorial). Also see the [Git
+comparison](https://jj-vcs.github.io/jj/latest/git-comparison), which
 includes a table of `jj` vs. `git` commands.
 
 As you become more familiar with Jujutsu, the following resources may be helpful:
 
-- The [FAQ](https://martinvonz.github.io/jj/latest/FAQ).
-- The [Glossary](https://martinvonz.github.io/jj/latest/glossary).
+- The [FAQ](https://jj-vcs.github.io/jj/latest/FAQ).
+- The [Glossary](https://jj-vcs.github.io/jj/latest/glossary).
 - The `jj help` command (e.g. `jj help rebase`).
 
 If you are using a **prerelease** version of `jj`, you would want to consult
 [the docs for the prerelease (main branch)
-version](https://martinvonz.github.io/jj/prerelease/). You can also get there
+version](https://jj-vcs.github.io/jj/prerelease/). You can also get there
 from the docs for the latest release by using the website's version switcher. The version switcher is visible in
 the header of the website when you scroll to the top of any page.
 
@@ -206,7 +206,7 @@ while the other is a native storage backend[^native-backend]. The Git backend
 uses the [libgit2](https://libgit2.org/) C library and the
 [gitoxide](https://github.com/Byron/gitoxide) Rust library.
 
-[backends]: https://martinvonz.github.io/jj/latest/glossary#backend
+[backends]: https://jj-vcs.github.io/jj/latest/glossary#backend
 
 [^native-backend]: At this time, there's practically no reason to use the native
 backend. The backend exists mainly to make sure that it's possible to eventually
@@ -222,7 +222,7 @@ Here is how you can explore a GitHub repository with `jj`.
 <img src="demos/git_compat.png" />
 
 You can even have a ["co-located" local
-repository](https://martinvonz.github.io/jj/latest/git-compatibility#co-located-jujutsugit-repos)
+repository](https://jj-vcs.github.io/jj/latest/git-compatibility#co-located-jujutsugit-repos)
 where you can use both `jj` and `git` commands interchangeably.
 
 ### The working copy is automatically committed
@@ -263,7 +263,7 @@ necessarily have to be the most recent operation).
 ### Conflicts can be recorded in commits
 
 If an operation results in
-[conflicts](https://martinvonz.github.io/jj/latest/glossary#conflict),
+[conflicts](https://jj-vcs.github.io/jj/latest/glossary#conflict),
 information about those conflicts will be recorded in the commit(s). The
 operation will succeed. You can then resolve the conflicts later. One
 consequence of this design is that there's no need to continue interrupted
@@ -316,7 +316,7 @@ scripts if requested.
 ## Related work
 
 There are several tools trying to solve similar problems as Jujutsu. See
-[related work](https://martinvonz.github.io/jj/latest/related-work) for details.
+[related work](https://jj-vcs.github.io/jj/latest/related-work) for details.
 
 ## Contributing
 
@@ -325,7 +325,7 @@ don't be shy. Please ask if you want a pointer on something you can help with,
 and hopefully we can all figure something out.
 
 We do have [a few policies and
-suggestions](https://martinvonz.github.io/jj/prerelease/contributing/)
+suggestions](https://jj-vcs.github.io/jj/prerelease/contributing/)
 for contributors. The broad TL;DR:
 
 - Bug reports are very welcome!

cli/src/cli_util.rs

@@ -1786,7 +1786,7 @@ to the current parents may contain changes from multiple commits.
                                 short_operation_hash(&old_op_id)
                             ),
                             "Run `jj workspace update-stale` to update it.
-See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy \
+See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy \
                              for more information.",
                         ),
                     ));
@@ -1806,7 +1806,7 @@ See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy \
                         user_error_with_hint(
                             "Could not read working copy's operation.",
                             "Run `jj workspace update-stale` to recover.
-See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy \
+See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy \
                              for more information.",
                         ),
                     ));
@@ -2506,7 +2506,7 @@ pub fn print_conflicted_paths(
             );
         }
         // TODO: We might decide it's OK for `jj resolve` to ignore special files in the
-        // `removes` of a conflict (see e.g. https://github.com/martinvonz/jj/pull/978). In
+        // `removes` of a conflict (see e.g. https://github.com/jj-vcs/jj/pull/978). In
         // that case, `conflict.removes` should be removed below.
         for term in itertools::chain(conflict.removes(), conflict.adds()).flatten() {
             seen_objects.insert(
@@ -2830,7 +2830,7 @@ impl LogContentFormat {
 
 pub fn run_ui_editor(settings: &UserSettings, edit_path: &Path) -> Result<(), CommandError> {
     // Work around UNC paths not being well supported on Windows (no-op for
-    // non-Windows): https://github.com/martinvonz/jj/issues/3986
+    // non-Windows): https://github.com/jj-vcs/jj/issues/3986
     let edit_path = dunce::simplified(edit_path);
     let editor: CommandNameAndArgs = settings.get("ui.editor")?;
     let mut cmd = editor.to_command();
@@ -3003,7 +3003,7 @@ impl fmt::Display for RemoteBookmarkNamePattern {
 
 /// Jujutsu (An experimental VCS)
 ///
-/// To get started, see the tutorial at https://martinvonz.github.io/jj/latest/tutorial/.
+/// To get started, see the tutorial at https://jj-vcs.github.io/jj/latest/tutorial/.
 #[allow(rustdoc::bare_urls)]
 #[derive(clap::Parser, Clone, Debug)]
 #[command(name = "jj")]

cli/src/command_error.rs

@@ -628,7 +628,7 @@ fn file_pattern_parse_error_hint(err: &FilePatternParseError) -> Option<String>
 fn fileset_parse_error_hint(err: &FilesetParseError) -> Option<String> {
     match err.kind() {
         FilesetParseErrorKind::SyntaxError => Some(String::from(
-            "See https://martinvonz.github.io/jj/latest/filesets/ for filesets syntax, or for how \
+            "See https://jj-vcs.github.io/jj/latest/filesets/ for filesets syntax, or for how \
              to match file paths.",
         )),
         FilesetParseErrorKind::NoSuchFunction {
@@ -750,7 +750,7 @@ fn try_handle_command_result(
             print_error(ui, "Config error: ", err, hints)?;
             writeln!(
                 ui.stderr_formatter().labeled("hint"),
-                "For help, see https://martinvonz.github.io/jj/latest/config/."
+                "For help, see https://jj-vcs.github.io/jj/latest/config/."
             )?;
             Ok(ExitCode::from(1))
         }

cli/src/commands/bookmark/delete.rs

@@ -31,7 +31,7 @@ pub struct BookmarkDeleteArgs {
     ///
     /// By default, the specified name matches exactly. Use `glob:` prefix to
     /// select bookmarks by wildcard pattern. For details, see
-    /// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.       
+    /// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.       
     #[arg(
         required = true,
         value_parser = StringPattern::parse,

cli/src/commands/bookmark/forget.rs

@@ -37,7 +37,7 @@ pub struct BookmarkForgetArgs {
     ///
     /// By default, the specified name matches exactly. Use `glob:` prefix to
     /// select bookmarks by wildcard pattern. For details, see
-    /// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.    
+    /// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.    
     #[arg(
         required = true,
         value_parser = StringPattern::parse,

cli/src/commands/bookmark/list.rs

@@ -37,7 +37,7 @@ use crate::ui::Ui;
 /// "+".
 ///
 /// For information about bookmarks, see
-/// https://martinvonz.github.io/jj/latest/bookmarks/.
+/// https://jj-vcs.github.io/jj/latest/bookmarks/.
 #[derive(clap::Args, Clone, Debug)]
 pub struct BookmarkListArgs {
     /// Show all tracking and non-tracking remote bookmarks including the ones
@@ -53,7 +53,7 @@ pub struct BookmarkListArgs {
     ///
     /// By default, the specified remote name matches exactly. Use `glob:`
     /// prefix to select remotes by wildcard pattern. For details, see
-    /// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
+    /// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.
     #[arg(
         long = "remote",
         value_name = "REMOTE",
@@ -76,7 +76,7 @@ pub struct BookmarkListArgs {
     ///
     /// By default, the specified name matches exactly. Use `glob:` prefix to
     /// select bookmarks by wildcard pattern. For details, see
-    /// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
+    /// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.
     #[arg(value_parser = StringPattern::parse, add = ArgValueCandidates::new(complete::bookmarks))]
     names: Option<Vec<StringPattern>>,
 
@@ -91,7 +91,7 @@ pub struct BookmarkListArgs {
     ///
     /// All 0-argument methods of the `RefName` type are available as keywords.
     ///
-    /// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
+    /// For the syntax, see https://jj-vcs.github.io/jj/latest/templates/
     #[arg(long, short = 'T')]
     template: Option<String>,
 }

cli/src/commands/bookmark/mod.rs

@@ -62,7 +62,7 @@ use crate::ui::Ui;
 /// Manage bookmarks [default alias: b]
 ///
 /// For information about bookmarks, see
-/// https://martinvonz.github.io/jj/latest/bookmarks.
+/// https://jj-vcs.github.io/jj/latest/bookmarks.
 #[derive(clap::Subcommand, Clone, Debug)]
 pub enum BookmarkCommand {
     #[command(visible_alias("c"))]

cli/src/commands/bookmark/move.rs

@@ -73,7 +73,7 @@ pub struct BookmarkMoveArgs {
     ///
     /// By default, the specified name matches exactly. Use `glob:` prefix to
     /// select bookmarks by wildcard pattern. For details, see
-    /// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
+    /// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.
     #[arg(
         group = "source",
         value_parser = StringPattern::parse,

cli/src/commands/bookmark/track.rs

@@ -37,7 +37,7 @@ pub struct BookmarkTrackArgs {
     ///
     /// By default, the specified name matches exactly. Use `glob:` prefix to
     /// select bookmarks by wildcard pattern. For details, see
-    /// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
+    /// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.
     ///
     /// Examples: bookmark@remote, glob:main@*, glob:jjfan-*@upstream
     #[arg(

cli/src/commands/bookmark/untrack.rs

@@ -33,7 +33,7 @@ pub struct BookmarkUntrackArgs {
     ///
     /// By default, the specified name matches exactly. Use `glob:` prefix to
     /// select bookmarks by wildcard pattern. For details, see     
-    /// https://martinvonz.github.io/jj/latest/revsets/#string-patterns.
+    /// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns.
     ///
     /// Examples: bookmark@remote, glob:main@*, glob:jjfan-*@upstream
     #[arg(

cli/src/commands/config/list.rs

@@ -52,7 +52,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://martinvonz.github.io/jj/latest/templates/
+    /// For the syntax, see https://jj-vcs.github.io/jj/latest/templates/
     #[arg(long, short = 'T', verbatim_doc_comment)]
     template: Option<String>,
 }

cli/src/commands/config/mod.rs

@@ -119,7 +119,7 @@ impl ConfigLevelArgs {
 /// environment variables.
 ///
 /// For file locations, supported config options, and other details about jj
-/// config, see https://martinvonz.github.io/jj/latest/config/.
+/// config, see https://jj-vcs.github.io/jj/latest/config/.
 #[derive(clap::Subcommand, Clone, Debug)]
 pub(crate) enum ConfigCommand {
     #[command(visible_alias("e"))]

cli/src/commands/diffedit.rs

@@ -36,7 +36,7 @@ use crate::ui::Ui;
 /// the "from" revision to the "to" revision.
 ///
 /// [diff editor]:
-///     https://martinvonz.github.io/jj/latest/config/#editing-diffs
+///     https://jj-vcs.github.io/jj/latest/config/#editing-diffs
 ///
 /// Edit the right side of the diff until it looks the way you want. Once you
 /// close the editor, the revision specified with `-r` or `--to` will be

cli/src/commands/edit.rs

@@ -29,7 +29,7 @@ use crate::ui::Ui;
 /// Note: it is generally recommended to instead use `jj new` and `jj
 /// squash`.
 ///
-/// For more information, see https://martinvonz.github.io/jj/latest/FAQ#how-do-i-resume-working-on-an-existing-change
+/// For more information, see https://jj-vcs.github.io/jj/latest/FAQ#how-do-i-resume-working-on-an-existing-change
 #[derive(clap::Args, Clone, Debug)]
 pub(crate) struct EditArgs {
     /// The commit to edit

cli/src/commands/evolog.rs

@@ -61,7 +61,7 @@ pub(crate) struct EvologArgs {
     no_graph: bool,
     /// Render each revision using the given template
     ///
-    /// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
+    /// For the syntax, see https://jj-vcs.github.io/jj/latest/templates/
     #[arg(long, short = 'T')]
     template: Option<String>,
     /// Show patch compared to the previous version of this change

cli/src/commands/git/mod.rs

@@ -52,7 +52,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://martinvonz.github.io/jj/latest/git-comparison/.
+/// https://jj-vcs.github.io/jj/latest/git-comparison/.
 #[derive(Subcommand, Clone, Debug)]
 pub enum GitCommand {
     Clone(GitCloneArgs),