diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a7cab67dbb..d6d24f523c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -10,7 +10,7 @@ assignees: '' ## Description diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index da7c95318b..3e33da0c7b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.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. --> diff --git a/.github/scripts/docs-build-deploy b/.github/scripts/docs-build-deploy index 7b54892e31..9c3d907082 100755 --- a/.github/scripts/docs-build-deploy +++ b/.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. diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7575f459d8..37e076dc01 100644 --- a/.github/workflows/docs.yml +++ b/.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)" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d9675f0ef..5ad7001edf 100644 --- a/.github/workflows/release.yml +++ b/.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)" diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9191cfd8..c94e2cbe4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,10 +62,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). * The `$NO_COLOR` environment variable must now be non-empty to be respected. * Fixed incompatible rendering of empty hunks in git/unified diffs. - [#5049](https://github.com/martinvonz/jj/issues/5049) + [#5049](https://github.com/jj-vcs/jj/issues/5049) * Fixed performance of progress bar rendering when fetching from Git remote. - [#5057](https://github.com/martinvonz/jj/issues/5057) + [#5057](https://github.com/jj-vcs/jj/issues/5057) * `jj config path --user` no longer creates new file at the default config path. @@ -73,11 +73,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Release highlights -* New [`jj absorb`](https://martinvonz.github.io/jj/latest/cli-reference/#jj-absorb) command automatically squashes changes from the current commit into relevant ancestor commits. +* New [`jj absorb`](https://jj-vcs.github.io/jj/latest/cli-reference/#jj-absorb) command automatically squashes changes from the current commit into relevant ancestor commits. -* Experimental dynamic shell completions have been added; see [the docs](https://martinvonz.github.io/jj/latest/install-and-setup/#command-line-completion) for configuration. +* Experimental dynamic shell completions have been added; see [the docs](https://jj-vcs.github.io/jj/latest/install-and-setup/#command-line-completion) for configuration. -* [`jj duplicate`](https://martinvonz.github.io/jj/latest/cli-reference/#jj-duplicate) now accepts `--destination`/`--insert-before`/`--insert-after`. +* [`jj duplicate`](https://jj-vcs.github.io/jj/latest/cli-reference/#jj-duplicate) now accepts `--destination`/`--insert-before`/`--insert-after`. * Some deprecated commands have been removed (`jj move`, `jj checkout`, `jj merge`). @@ -95,7 +95,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). * Lines prefixed with "JJ:" in commit descriptions and in sparse patterns (from `jj sparse edit`) are now stripped even if they are not immediately followed - by a space. [#5004](https://github.com/martinvonz/jj/issues/5004) + by a space. [#5004](https://github.com/jj-vcs/jj/issues/5004) ### Deprecations @@ -112,7 +112,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). options, like `jj rebase -r` and `jj rebase -s`. * A preview of improved shell completions was added. Please refer to the - [documentation](https://martinvonz.github.io/jj/latest/install-and-setup/#command-line-completion) + [documentation](https://jj-vcs.github.io/jj/latest/install-and-setup/#command-line-completion) to activate them. They additionally complete context-dependent, dynamic values like bookmarks, aliases, revisions, operations and files. @@ -192,7 +192,7 @@ Thanks to the people who made this release happen! * Fixed path traversal by cloning/checking out crafted Git repository containing `..`, `.jj`, `.git` paths. - ([GHSA-88h5-6w7m-5w56](https://github.com/martinvonz/jj/security/advisories/GHSA-88h5-6w7m-5w56);CVE-2024-51990) + ([GHSA-88h5-6w7m-5w56](https://github.com/jj-vcs/jj/security/advisories/GHSA-88h5-6w7m-5w56);CVE-2024-51990) ### Breaking changes @@ -276,7 +276,7 @@ Thanks to the people who made this release happen! ### Fixed bugs * Error on `trunk()` revset resolution is now handled gracefully. - [#4616](https://github.com/martinvonz/jj/issues/4616) + [#4616](https://github.com/jj-vcs/jj/issues/4616) * Updated the built-in diff editor `scm-record` to version [0.4.0](https://github.com/arxanas/scm-record/releases/tag/v0.4.0), which @@ -320,7 +320,7 @@ Thanks to the people who made this release happen! ### Breaking changes -* Fixing [#4239](https://github.com/martinvonz/jj/issues/4239) means the +* Fixing [#4239](https://github.com/jj-vcs/jj/issues/4239) means the ordering of some messages have changed. * Invalid `ui.graph.style` configuration is now an error. @@ -366,7 +366,7 @@ Thanks to the people who made this release happen! command to manually tracks path that were not automatically tracked. There is no way to list untracked files yet. Use `git status` in a colocated workspace as a workaround. - [#323](https://github.com/martinvonz/jj/issues/323) + [#323](https://github.com/jj-vcs/jj/issues/323) * `jj fix` now allows fixing unchanged files with the `--include-unchanged-files` flag. This can be used to more easily introduce automatic formatting changes in a new @@ -413,7 +413,7 @@ Thanks to the people who made this release happen! from leaving the working copy in a stale state. * Fixed panic when parsing invalid conflict markers of a particular form. - ([#2611](https://github.com/martinvonz/jj/pull/2611)) + ([#2611](https://github.com/jj-vcs/jj/pull/2611)) * Editing a hidden commit now makes it visible. @@ -510,7 +510,7 @@ Thanks to the people who made this release happen! * `jj` now links `libgit2` statically by default. To use dynamic linking, you need to set the environment variable `LIBGIT2_NO_VENDOR=1` while compiling. - ([#4163](https://github.com/martinvonz/jj/pull/4163)) + ([#4163](https://github.com/jj-vcs/jj/pull/4163)) ### Breaking changes @@ -673,7 +673,7 @@ Thanks to the people who made this release happen! * `jj branch set` now creates new branch if it doesn't exist. Use `jj branch move` to ensure that the target branch already exists. - [#3584](https://github.com/martinvonz/jj/issues/3584) + [#3584](https://github.com/jj-vcs/jj/issues/3584) ### Deprecations @@ -703,7 +703,7 @@ Thanks to the people who made this release happen! like the `ancestors()` depth argument, it limits the depth of the set. * Revset/template aliases now support function overloading. - [#2966](https://github.com/martinvonz/jj/issues/2966) + [#2966](https://github.com/jj-vcs/jj/issues/2966) * Conflicted files are individually simplified before being materialized. @@ -731,7 +731,7 @@ Thanks to the people who made this release happen! * Author timestamp is now reset when rewriting discardable commits (empty commits with no description) if authored by the current user. - [#2000](https://github.com/martinvonz/jj/issues/2000) + [#2000](https://github.com/jj-vcs/jj/issues/2000) * `jj commit` now accepts `--reset-author` option to match `jj describe`. @@ -741,11 +741,11 @@ Thanks to the people who made this release happen! * `jj git push` now ignores immutable commits when checking whether a to-be-pushed commit has conflicts, or has no description / committer / author - set. [#3029](https://github.com/martinvonz/jj/issues/3029) + set. [#3029](https://github.com/jj-vcs/jj/issues/3029) * `jj` will look for divergent changes outside the short prefix set even if it finds the change id inside the short prefix set. - [#2476](https://github.com/martinvonz/jj/issues/2476) + [#2476](https://github.com/jj-vcs/jj/issues/2476) ### Contributors @@ -794,7 +794,7 @@ Thanks to the people who made this release happen! * If a new working-copy commit is created because the old one was abandoned, and the old commit was merge, then the new commit will now also be. - [#2859](https://github.com/martinvonz/jj/issues/2859) + [#2859](https://github.com/jj-vcs/jj/issues/2859) * `jj new`'s `--insert-before`/`--insert-after` options must now be set for each commit the new commit will be inserted before/after. Previously, those options @@ -834,8 +834,8 @@ Thanks to the people who made this release happen! * New command `jj fix` that can be configured to update commits by running code formatters (or similar tools) on changed files. The configuration schema and flags are minimal for now, with a number of improvements planned (for example, - [#3800](https://github.com/martinvonz/jj/issues/3800) and - [#3801](https://github.com/martinvonz/jj/issues/3801)). + [#3800](https://github.com/jj-vcs/jj/issues/3800) and + [#3801](https://github.com/jj-vcs/jj/issues/3801)). * `jj new`'s `--insert-before` and `--insert-after` options can now be used simultaneously. @@ -985,7 +985,7 @@ Thanks to the people who made this release happen! * `jj squash ` is now a no-op if the path argument didn't match any paths (it used to create new commits with bumped timestamp). - [#3334](https://github.com/martinvonz/jj/issues/3334) + [#3334](https://github.com/jj-vcs/jj/issues/3334) ### Contributors @@ -1119,7 +1119,7 @@ No code changes (fixing Rust `Cargo.toml` stuff). * The on-disk index format changed. New index files will be created automatically, but it can fail if the repository is co-located and predates - Git GC issues [#815](https://github.com/martinvonz/jj/issues/815). If + Git GC issues [#815](https://github.com/jj-vcs/jj/issues/815). If reindexing failed, you'll need to clean up corrupted operation history by `jj op abandon ..`. @@ -1171,8 +1171,8 @@ No code changes (fixing Rust `Cargo.toml` stuff). * Set config `ui.log-synthetic-elided-nodes = true` to make `jj log` include synthetic nodes in the graph where some revisions were elided - ([#1252](https://github.com/martinvonz/jj/issues/1252), - [#2971](https://github.com/martinvonz/jj/issues/2971)). This may become the + ([#1252](https://github.com/jj-vcs/jj/issues/1252), + [#2971](https://github.com/jj-vcs/jj/issues/2971)). This may become the default depending on feedback. * When creating a new workspace, the sparse patterns are now copied over from @@ -1191,7 +1191,7 @@ No code changes (fixing Rust `Cargo.toml` stuff). * `jj commit`/`diffedit`/`move`/`resolve`/`split`/`squash`/`unsquash` now accept `--tool=` option to override the default. - [#2575](https://github.com/martinvonz/jj/issues/2575) + [#2575](https://github.com/jj-vcs/jj/issues/2575) * Added completions for [Nushell](https://nushell.sh) to `jj util completion` @@ -1212,14 +1212,14 @@ No code changes (fixing Rust `Cargo.toml` stuff). When symlink support is unavailable, they will be materialized as regular files in the working copy (instead of resulting in a crash). - [#2](https://github.com/martinvonz/jj/issues/2) + [#2](https://github.com/jj-vcs/jj/issues/2) * On Windows, the `:builtin` pager is now used by default, rather than being disabled entirely. * Auto-rebase now preserves the shape of history even for merge commits where one parent is an ancestor of another. - [#2600](https://github.com/martinvonz/jj/issues/2600) + [#2600](https://github.com/jj-vcs/jj/issues/2600) ### Contributors @@ -1344,11 +1344,11 @@ Thanks to the people who made this release happen! ### Fixed bugs * Fixed snapshots of symlinks in `gitignore`-d directory. - [#2878](https://github.com/martinvonz/jj/issues/2878) + [#2878](https://github.com/jj-vcs/jj/issues/2878) * Fixed data loss in dirty working copy when checked-out branch is rebased or abandoned by Git. - [#2876](https://github.com/martinvonz/jj/issues/2876) + [#2876](https://github.com/jj-vcs/jj/issues/2876) ### Contributors @@ -1391,7 +1391,7 @@ Thanks to the people who made this release happen! * Command aliases can now be loaded from repository config relative to the current working directory. - [#2414](https://github.com/martinvonz/jj/issues/2414) + [#2414](https://github.com/jj-vcs/jj/issues/2414) ### Contributors @@ -1427,7 +1427,7 @@ Thanks to the people who made this release happen! * You can now set `git.abandon-unreachable-commits = false` to disable the usual behavior where commits that became unreachable in the Git repo are - abandoned ([#2504](https://github.com/martinvonz/jj/pull/2504)). + abandoned ([#2504](https://github.com/jj-vcs/jj/pull/2504)). * `jj new` gained a `--no-edit` option to prevent editing the newly created commit. For example, `jj new a b --no-edit -m Merge` creates a merge commit @@ -1444,7 +1444,7 @@ Thanks to the people who made this release happen! * Fixed another file conflict resolution issue where `jj status` would disagree with the actual file content. - [#2654](https://github.com/martinvonz/jj/issues/2654) + [#2654](https://github.com/jj-vcs/jj/issues/2654) ### Contributors @@ -1543,13 +1543,13 @@ Thanks to the people who made this release happen! * Updating the working copy to a commit where a file that's currently ignored in the working copy no longer leads to a crash - ([#976](https://github.com/martinvonz/jj/issues/976)). + ([#976](https://github.com/jj-vcs/jj/issues/976)). * Conflicts in executable files can now be resolved just like conflicts in - non-executable files ([#1279](https://github.com/martinvonz/jj/issues/1279)). + non-executable files ([#1279](https://github.com/jj-vcs/jj/issues/1279)). * `jj new --insert-before` and `--insert-after` now respect immutable revisions - ([#2468](https://github.com/martinvonz/jj/pull/2468)). + ([#2468](https://github.com/jj-vcs/jj/pull/2468)). ### Contributors @@ -1682,7 +1682,7 @@ Thanks to the people who made this release happen! * It's no longer allowed to create a Git remote named "git". Use `jj git remote rename` to rename the existing remote. - [#1690](https://github.com/martinvonz/jj/issues/1690) + [#1690](https://github.com/jj-vcs/jj/issues/1690) * Revset expression like `origin/main` will no longer resolve to a remote-tracking branch. Use `main@origin` instead. @@ -1702,7 +1702,7 @@ Thanks to the people who made this release happen! directories. * `jj log` output is now topologically grouped. - [#242](https://github.com/martinvonz/jj/issues/242) + [#242](https://github.com/jj-vcs/jj/issues/242) * `jj git clone` now supports the `--colocate` flag to create the git repo in the same directory as the jj repo. @@ -1713,7 +1713,7 @@ Thanks to the people who made this release happen! * `jj diff`/`log` now supports `--tool ` option to generate diffs by external program. For configuration, see [the documentation](docs/config.md). - [#1886](https://github.com/martinvonz/jj/issues/1886) + [#1886](https://github.com/jj-vcs/jj/issues/1886) * A new experimental diff editor `meld-3` is introduced that sets up Meld to allow you to see both sides of the original diff while editing. This can be @@ -1755,12 +1755,12 @@ Thanks to the people who made this release happen! * `jj next` and `jj prev` are added, these allow you to traverse the history in a linear style. For people coming from Sapling and `git-branchles` - see [#2126](https://github.com/martinvonz/jj/issues/2126) for + see [#2126](https://github.com/jj-vcs/jj/issues/2126) for further pending improvements. * `jj diff --stat` has been implemented. It shows a histogram of the changes, same as `git diff --stat`. - Fixes [#2066](https://github.com/martinvonz/jj/issues/2066) + Fixes [#2066](https://github.com/jj-vcs/jj/issues/2066) * `jj git fetch --all-remotes` has been implemented. It fetches all remotes instead of just the default remote @@ -1768,20 +1768,20 @@ Thanks to the people who made this release happen! ### Fixed bugs * Fix issues related to .gitignore handling of untracked directories - [#2051](https://github.com/martinvonz/jj/issues/2051). + [#2051](https://github.com/jj-vcs/jj/issues/2051). * `jj config set --user` and `jj config edit --user` can now be used outside of any repository. * SSH authentication could hang when ssh-agent couldn't be reached - [#1970](https://github.com/martinvonz/jj/issues/1970) + [#1970](https://github.com/jj-vcs/jj/issues/1970) * SSH authentication can now use ed25519 and ed25519-sk keys. They still need to be password-less. * Git repository managed by the repo tool can now be detected as a "colocated" repository. - [#2011](https://github.com/martinvonz/jj/issues/2011) + [#2011](https://github.com/jj-vcs/jj/issues/2011) ### Contributors @@ -1875,7 +1875,7 @@ Thanks to the people who made this release happen! `jj config set --repo user.email "somebody@example.com"` * Added `ui.log-word-wrap` option to wrap `jj log`/`obslog`/`op log` content - based on terminal width. [#1043](https://github.com/martinvonz/jj/issues/1043) + based on terminal width. [#1043](https://github.com/jj-vcs/jj/issues/1043) * Nodes in the (text-based) graphical log output now use a `◉` symbol instead of the letter `o`. The ASCII-based graph styles still use `o`. @@ -1942,7 +1942,7 @@ Thanks to the people who made this release happen! ### Fixed bugs * Modify/delete conflicts now include context lines - [#1244](https://github.com/martinvonz/jj/issues/1244). + [#1244](https://github.com/jj-vcs/jj/issues/1244). * It is now possible to modify either side of a modify/delete conflict (any change used to be considered a resolution). @@ -1964,27 +1964,27 @@ Thanks to the people who made this release happen! * `git checkout` (without using `jj`) in colocated repo no longer abandons the previously checked-out anonymous branch. - [#1042](https://github.com/martinvonz/jj/issues/1042). + [#1042](https://github.com/jj-vcs/jj/issues/1042). * `jj git fetch` in a colocated repo now abandons branches deleted on the remote, just like in a non-colocated repo. - [#864](https://github.com/martinvonz/jj/issues/864) + [#864](https://github.com/jj-vcs/jj/issues/864) * `jj git fetch` can now fetch forgotten branches even if they didn't move on the remote. - [#1714](https://github.com/martinvonz/jj/pull/1714) - [#1771](https://github.com/martinvonz/jj/pull/1771) + [#1714](https://github.com/jj-vcs/jj/pull/1714) + [#1771](https://github.com/jj-vcs/jj/pull/1771) * It is now possible to `jj branch forget` deleted branches. - [#1537](https://github.com/martinvonz/jj/issues/1537) + [#1537](https://github.com/jj-vcs/jj/issues/1537) * Fixed race condition when assigning change id to Git commit. If you've already had unreachable change ids, run `jj debug reindex`. - [#924](https://github.com/martinvonz/jj/issues/924) + [#924](https://github.com/jj-vcs/jj/issues/924) * Fixed false divergence on racy working-copy snapshots. - [#697](https://github.com/martinvonz/jj/issues/697), - [#1608](https://github.com/martinvonz/jj/issues/1608) + [#697](https://github.com/jj-vcs/jj/issues/697), + [#1608](https://github.com/jj-vcs/jj/issues/1608) * In colocated repos, a bug causing conflicts when undoing branch moves (#922) has been fixed. Some surprising behaviors related to undoing `jj git push` or @@ -2199,7 +2199,7 @@ Thanks to the people who made this release happen! * `jj duplicate` followed by `jj rebase` of a tree containing both the original and duplicate commit no longer crashes. The fix should also resolve any remaining - instances of https://github.com/martinvonz/jj/issues/27. + instances of https://github.com/jj-vcs/jj/issues/27. * Fix the output of `jj debug completion --help` by reversing fish and zsh text. @@ -2263,7 +2263,7 @@ No changes, only changed to a released version of the `thrift` crate dependency. ### New features * Commands with long output are paginated. - [#9](https://github.com/martinvonz/jj/issues/9) + [#9](https://github.com/jj-vcs/jj/issues/9) * The new `jj git remote rename` command allows git remotes to be renamed in-place. @@ -2286,11 +2286,11 @@ No changes, only changed to a released version of the `thrift` crate dependency. * `jj git` subcommands will prompt for credentials when required for HTTPS remotes rather than failing. - [#469](https://github.com/martinvonz/jj/issues/469) + [#469](https://github.com/jj-vcs/jj/issues/469) * Branches that have a different target on some remote than they do locally are now indicated by an asterisk suffix (e.g. `main*`) in `jj log`. - [#254](https://github.com/martinvonz/jj/issues/254) + [#254](https://github.com/jj-vcs/jj/issues/254) * The commit ID was moved from first on the line in `jj log` output to close to the end. The goal is to encourage users to use the change ID instead, since @@ -2317,13 +2317,13 @@ No changes, only changed to a released version of the `thrift` crate dependency. * A bug in the export of branches to Git caused spurious conflicted branches. This typically occurred when running in a working copy colocated with Git (created by running `jj init --git-dir=.`). - [#463](https://github.com/martinvonz/jj/issues/463) + [#463](https://github.com/jj-vcs/jj/issues/463) * When exporting branches to Git, we used to fail if some branches could not be exported (e.g. because Git doesn't allow a branch called `main` and another branch called `main/sub`). We now print a warning about these branches instead. - [#493](https://github.com/martinvonz/jj/issues/493) + [#493](https://github.com/jj-vcs/jj/issues/493) * If you had modified branches in jj and also modified branches in conflicting ways in Git, `jj git export` used to overwrite the changes you made in Git. @@ -2343,7 +2343,7 @@ No changes, only changed to a released version of the `thrift` crate dependency. * Git's GC could remove commits that were referenced from jj in some cases. We are now better at adding Git refs to prevent that. - [#815](https://github.com/martinvonz/jj/issues/815) + [#815](https://github.com/jj-vcs/jj/issues/815) * When the working-copy commit was a merge, `jj status` would list only the first parent, and the diff summary would be against that parent. The output @@ -2389,8 +2389,8 @@ No changes (just trying to get automated GitHub release to work). branches (plus their closest commit on the remote branch for context). This set of commits can be overridden by setting `ui.default-revset`. Use `jj log -r 'all()'` for the old behavior. Read more about revsets - [here](https://github.com/martinvonz/jj/blob/main/docs/revsets.md). - [#250](https://github.com/martinvonz/jj/issues/250) + [here](https://github.com/jj-vcs/jj/blob/main/docs/revsets.md). + [#250](https://github.com/jj-vcs/jj/issues/250) * `jj new` now always checks out the new commit (used to be only if the parent was `@`). @@ -2404,7 +2404,7 @@ No changes (just trying to get automated GitHub release to work). * `jj branch` now uses subcommands like `jj branch create` and `jj branch forget` instead of options like `jj branch --forget`. - [#330](https://github.com/martinvonz/jj/issues/330) + [#330](https://github.com/jj-vcs/jj/issues/330) * The [`$NO_COLOR` environment variable](https://no-color.org/) no longer overrides the `ui.color` configuration if explicitly set. @@ -2436,7 +2436,7 @@ No changes (just trying to get automated GitHub release to work). * The new `jj git remotes list` command lists the configured remotes and their URLs. - [#243](https://github.com/martinvonz/jj/issues/243) + [#243](https://github.com/jj-vcs/jj/issues/243) * `jj move` and `jj squash` now lets you limit the set of changes to move by specifying paths on the command line (in addition to the `--interactive` @@ -2604,7 +2604,7 @@ No changes (just trying to get automated GitHub release to work). concurrent operations (so if one operation added B on top of A, and one operation rebased A as A', then B would be automatically rebased on top of A'). See #111 for more examples. - [#111](https://github.com/martinvonz/jj/issues/111) + [#111](https://github.com/jj-vcs/jj/issues/111) * `jj log` now accepts `-p`/`--patch` option. @@ -2629,7 +2629,7 @@ No changes, only trying to get the automated build to work. - Fixed crash when `core.excludesFile` pointed to nonexistent file, and made leading `~/` in that config expand to `$HOME/` - [#131](https://github.com/martinvonz/jj/issues/131) + [#131](https://github.com/jj-vcs/jj/issues/131) ## [0.3.0] - 2022-03-12 diff --git a/Cargo.toml b/Cargo.toml index 85f640cadd..7f4c0339f3 100644 --- a/Cargo.toml +++ b/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"] diff --git a/README.md b/README.md index 13c23526c2..af943ed629 100644 --- a/README.md +++ b/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 @@ -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`. 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! diff --git a/cli/src/cli_util.rs b/cli/src/cli_util.rs index cb770db720..63a0647125 100644 --- a/cli/src/cli_util.rs +++ b/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")] diff --git a/cli/src/command_error.rs b/cli/src/command_error.rs index 158b089feb..cc29f5913c 100644 --- a/cli/src/command_error.rs +++ b/cli/src/command_error.rs @@ -638,8 +638,8 @@ fn file_pattern_parse_error_hint(err: &FilePatternParseError) -> Option fn fileset_parse_error_hint(err: &FilesetParseError) -> Option { match err.kind() { FilesetParseErrorKind::SyntaxError => Some(String::from( - "See https://martinvonz.github.io/jj/latest/filesets/ for filesets syntax, or for how \ - to match file paths.", + "See https://jj-vcs.github.io/jj/latest/filesets/ for filesets syntax, or for how to \ + match file paths.", )), FilesetParseErrorKind::NoSuchFunction { name: _, @@ -760,7 +760,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)) } diff --git a/cli/src/commands/bookmark/delete.rs b/cli/src/commands/bookmark/delete.rs index a18f865f64..8521a0ead4 100644 --- a/cli/src/commands/bookmark/delete.rs +++ b/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, diff --git a/cli/src/commands/bookmark/forget.rs b/cli/src/commands/bookmark/forget.rs index c96120808e..3e9c40a2b3 100644 --- a/cli/src/commands/bookmark/forget.rs +++ b/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, diff --git a/cli/src/commands/bookmark/list.rs b/cli/src/commands/bookmark/list.rs index f51b0b8bcb..d95e20ebc1 100644 --- a/cli/src/commands/bookmark/list.rs +++ b/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>, @@ -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, } diff --git a/cli/src/commands/bookmark/mod.rs b/cli/src/commands/bookmark/mod.rs index 9e955e6609..82f6c1b106 100644 --- a/cli/src/commands/bookmark/mod.rs +++ b/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"))] diff --git a/cli/src/commands/bookmark/move.rs b/cli/src/commands/bookmark/move.rs index e12b2ea271..26208352c5 100644 --- a/cli/src/commands/bookmark/move.rs +++ b/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, diff --git a/cli/src/commands/bookmark/track.rs b/cli/src/commands/bookmark/track.rs index 6c5fa0bfd9..7c72b78624 100644 --- a/cli/src/commands/bookmark/track.rs +++ b/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( diff --git a/cli/src/commands/bookmark/untrack.rs b/cli/src/commands/bookmark/untrack.rs index d06cf172eb..8a329d1b99 100644 --- a/cli/src/commands/bookmark/untrack.rs +++ b/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( diff --git a/cli/src/commands/config/list.rs b/cli/src/commands/config/list.rs index 2009bc55c7..b32aac0033 100644 --- a/cli/src/commands/config/list.rs +++ b/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, } diff --git a/cli/src/commands/config/mod.rs b/cli/src/commands/config/mod.rs index 2a49bf80b8..2e98d9e363 100644 --- a/cli/src/commands/config/mod.rs +++ b/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"))] diff --git a/cli/src/commands/diffedit.rs b/cli/src/commands/diffedit.rs index 89ee99b5de..8763ce815b 100644 --- a/cli/src/commands/diffedit.rs +++ b/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 diff --git a/cli/src/commands/edit.rs b/cli/src/commands/edit.rs index e32ae969ac..b89754e58a 100644 --- a/cli/src/commands/edit.rs +++ b/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 diff --git a/cli/src/commands/evolog.rs b/cli/src/commands/evolog.rs index 70d42272b5..d354e46f66 100644 --- a/cli/src/commands/evolog.rs +++ b/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, /// Show patch compared to the previous version of this change diff --git a/cli/src/commands/git/mod.rs b/cli/src/commands/git/mod.rs index a434d0c6c2..b9a804b425 100644 --- a/cli/src/commands/git/mod.rs +++ b/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), diff --git a/cli/src/commands/git/push.rs b/cli/src/commands/git/push.rs index d835023940..49004505a5 100644 --- a/cli/src/commands/git/push.rs +++ b/cli/src/commands/git/push.rs @@ -68,10 +68,10 @@ use crate::ui::Ui; /// conflicts]. /// /// [safety checks]: -/// https://martinvonz.github.io/jj/latest/bookmarks/#pushing-bookmarks-safety-checks +/// https://jj-vcs.github.io/jj/latest/bookmarks/#pushing-bookmarks-safety-checks /// /// [bookmark conflicts]: -/// https://martinvonz.github.io/jj/latest/bookmarks/#conflicts +/// https://jj-vcs.github.io/jj/latest/bookmarks/#conflicts #[derive(clap::Args, Clone, Debug)] #[command(group(ArgGroup::new("specific").args(&["bookmark", "change", "revisions"]).multiple(true)))] @@ -90,7 +90,7 @@ pub struct GitPushArgs { /// /// 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( long, short, alias = "branch", @@ -105,7 +105,7 @@ pub struct GitPushArgs { /// /// This usually means that the bookmark was already pushed to or fetched /// from the relevant remote. For details, see - /// https://martinvonz.github.io/jj/latest/bookmarks#remotes-and-tracked-bookmarks + /// https://jj-vcs.github.io/jj/latest/bookmarks#remotes-and-tracked-bookmarks #[arg(long)] tracked: bool, /// Push all deleted bookmarks diff --git a/cli/src/commands/help.rs b/cli/src/commands/help.rs index 408e633ab7..7f4d36ad68 100644 --- a/cli/src/commands/help.rs +++ b/cli/src/commands/help.rs @@ -93,7 +93,7 @@ struct Keyword { // // TODO: Find a way to render markdown using ANSI escape codes. // -// Maybe we can steal some ideas from https://github.com/martinvonz/jj/pull/3130 +// Maybe we can steal some ideas from https://github.com/jj-vcs/jj/pull/3130 const KEYWORDS: &[Keyword] = &[ Keyword { name: "bookmarks", diff --git a/cli/src/commands/log.rs b/cli/src/commands/log.rs index 0afdd57038..03ef5735b6 100644 --- a/cli/src/commands/log.rs +++ b/cli/src/commands/log.rs @@ -47,16 +47,16 @@ use crate::ui::Ui; /// before parents. By default, the output only includes mutable revisions, /// along with some additional revisions for context. Use `jj log -r ::` to see /// all revisions. See `jj help -k revsets` (or -/// https://martinvonz.github.io/jj/latest/revsets/) for information about the +/// https://jj-vcs.github.io/jj/latest/revsets/) for information about the /// syntax. /// /// Spans of revisions that are not included in the graph per `--revisions` are /// rendered as a synthetic node labeled "(elided revisions)". /// /// The working-copy commit is indicated by a `@` symbol in the graph. Immutable -/// revisions (https://martinvonz.github.io/jj/latest/config/#set-of-immutable-commits) +/// revisions (https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits) /// have a `◆` symbol. Other commits have a `○` symbol. To customize these -/// symbols, see https://martinvonz.github.io/jj/latest/config/#node-style. +/// symbols, see https://jj-vcs.github.io/jj/latest/config/#node-style. #[derive(clap::Args, Clone, Debug)] pub(crate) struct LogArgs { /// Which revisions to show @@ -95,7 +95,7 @@ pub(crate) struct LogArgs { /// Run `jj log -T` to list the built-in templates. /// /// You can also specify arbitrary template expressions. For the syntax, - /// see https://martinvonz.github.io/jj/latest/templates/. + /// see https://jj-vcs.github.io/jj/latest/templates/. /// /// If not specified, this defaults to the `templates.log` setting. #[arg(long, short = 'T')] diff --git a/cli/src/commands/new.rs b/cli/src/commands/new.rs index df676b650d..486330b8e5 100644 --- a/cli/src/commands/new.rs +++ b/cli/src/commands/new.rs @@ -48,7 +48,7 @@ use crate::ui::Ui; /// working copy and the `main` bookmark as parents. /// /// For more information, see -/// https://martinvonz.github.io/jj/latest/working-copy/. +/// https://jj-vcs.github.io/jj/latest/working-copy/. #[derive(clap::Args, Clone, Debug)] pub(crate) struct NewArgs { /// Parent(s) of the new change diff --git a/cli/src/commands/operation/log.rs b/cli/src/commands/operation/log.rs index 7d5d245c45..77a8b5c1b0 100644 --- a/cli/src/commands/operation/log.rs +++ b/cli/src/commands/operation/log.rs @@ -62,7 +62,7 @@ pub struct OperationLogArgs { no_graph: bool, /// Render each operation 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, /// Show changes to the repository at each operation diff --git a/cli/src/commands/operation/mod.rs b/cli/src/commands/operation/mod.rs index 5df6151ff2..3f3ff03ede 100644 --- a/cli/src/commands/operation/mod.rs +++ b/cli/src/commands/operation/mod.rs @@ -40,7 +40,7 @@ use crate::ui::Ui; /// Commands for working with the operation log /// /// For information about the operation log, see -/// https://martinvonz.github.io/jj/latest/operation-log/. +/// https://jj-vcs.github.io/jj/latest/operation-log/. #[derive(Subcommand, Clone, Debug)] pub enum OperationCommand { Abandon(OperationAbandonArgs), diff --git a/cli/src/commands/show.rs b/cli/src/commands/show.rs index 8edc417494..ec63b9c849 100644 --- a/cli/src/commands/show.rs +++ b/cli/src/commands/show.rs @@ -34,7 +34,7 @@ pub(crate) struct ShowArgs { unused_revision: bool, /// Render a 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, #[command(flatten)] diff --git a/cli/src/commands/split.rs b/cli/src/commands/split.rs index 4e53bb545a..a33f01f384 100644 --- a/cli/src/commands/split.rs +++ b/cli/src/commands/split.rs @@ -36,7 +36,7 @@ use crate::ui::Ui; /// revision. The remaining changes will be put in a new revision on top. /// /// [diff editor]: -/// https://martinvonz.github.io/jj/latest/config/#editing-diffs +/// https://jj-vcs.github.io/jj/latest/config/#editing-diffs /// /// If the change you split had a description, you will be asked to enter a /// change description for each commit. If the change did not have a diff --git a/cli/src/commands/status.rs b/cli/src/commands/status.rs index 8c1d9d9137..baaca96c46 100644 --- a/cli/src/commands/status.rs +++ b/cli/src/commands/status.rs @@ -32,7 +32,7 @@ use crate::ui::Ui; /// /// * The working copy commit and its (first) parent, and a summary of the /// changes between them -/// * Conflicted bookmarks (see https://martinvonz.github.io/jj/latest/bookmarks/) +/// * Conflicted bookmarks (see https://jj-vcs.github.io/jj/latest/bookmarks/) #[derive(clap::Args, Clone, Debug)] #[command(visible_alias = "st")] pub(crate) struct StatusArgs { diff --git a/cli/src/commands/tag.rs b/cli/src/commands/tag.rs index cc3709f202..11e2fcd215 100644 --- a/cli/src/commands/tag.rs +++ b/cli/src/commands/tag.rs @@ -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://martinvonz.github.io/jj/latest/revsets/#string-patterns. + /// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns. #[arg(value_parser = StringPattern::parse)] pub names: Vec, /// Render each tag using the given template /// /// 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, } diff --git a/cli/src/commands/workspace/update_stale.rs b/cli/src/commands/workspace/update_stale.rs index e7a4a25730..745c21b274 100644 --- a/cli/src/commands/workspace/update_stale.rs +++ b/cli/src/commands/workspace/update_stale.rs @@ -21,7 +21,7 @@ use crate::ui::Ui; /// Update a workspace that has become stale /// /// For information about stale working copies, see -/// https://martinvonz.github.io/jj/latest/working-copy/. +/// https://jj-vcs.github.io/jj/latest/working-copy/. #[derive(clap::Args, Clone, Debug)] pub struct WorkspaceUpdateStaleArgs {} diff --git a/cli/src/commit_templater.rs b/cli/src/commit_templater.rs index 589974e552..c0746a01bf 100644 --- a/cli/src/commit_templater.rs +++ b/cli/src/commit_templater.rs @@ -831,7 +831,7 @@ fn builtin_commit_methods<'repo>() -> CommitTemplateBuildMethodFnMap<'repo, Comm expect_fileset_literal(diagnostics, node, language.path_converter)? } else { // TODO: defaults to CLI path arguments? - // https://github.com/martinvonz/jj/issues/2933#issuecomment-1925870731 + // https://github.com/jj-vcs/jj/issues/2933#issuecomment-1925870731 FilesetExpression::all() }; let repo = language.repo; diff --git a/cli/src/config-schema.json b/cli/src/config-schema.json index eb70c18b10..8a02e71165 100644 --- a/cli/src/config-schema.json +++ b/cli/src/config-schema.json @@ -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://martinvonz.github.io/jj/latest/config/ for details", + "description": "User configuration for Jujutsu VCS. See https://jj-vcs.github.io/jj/latest/config/ for details", "properties": { "user": { "type": "object", @@ -137,7 +137,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://martinvonz.github.io/jj/latest/config/#graph-style", + "description": "Style of connectors/markings used to render the graph. See https://jj-vcs.github.io/jj/latest/config/#graph-style", "enum": [ "curved", "square", @@ -330,7 +330,7 @@ "properties": { "auto-local-bookmark": { "type": "boolean", - "description": "Whether jj creates a local bookmark with the same name when it imports a remote-tracking branch from git. See https://martinvonz.github.io/jj/latest/config/#automatic-local-bookmark-creation", + "description": "Whether jj creates a local bookmark with the same name when it imports a remote-tracking branch from git. See https://jj-vcs.github.io/jj/latest/config/#automatic-local-bookmark-creation", "default": false }, "abandon-unreachable-commits": { @@ -405,12 +405,12 @@ "items": { "type": "number" }, - "description": "Array of exit codes to indicate that the conflict was only partially resolved. See https://martinvonz.github.io/jj/latest/config/#editing-conflict-markers-with-a-tool-or-a-text-editor", + "description": "Array of exit codes to indicate that the conflict was only partially resolved. See https://jj-vcs.github.io/jj/latest/config/#editing-conflict-markers-with-a-tool-or-a-text-editor", "default": [] }, "merge-tool-edits-conflict-markers": { "type": "boolean", - "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", + "description": "Whether to populate the output file with conflict markers before starting the merge tool. See https://jj-vcs.github.io/jj/latest/config/#editing-conflict-markers-with-a-tool-or-a-text-editor", "default": false }, "conflict-marker-style": { @@ -490,7 +490,7 @@ }, "auto-update-stale": { "type": "boolean", - "description": "Whether to automatically update the working copy if it is stale. See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy", + "description": "Whether to automatically update the working copy if it is stale. See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy", "default": "false" }, "max-new-file-size": { diff --git a/cli/src/config.rs b/cli/src/config.rs index e547d59c47..0bf738f00f 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -376,7 +376,7 @@ fn config_files_for( /// Sources from the lowest precedence: /// 1. Default /// 2. Base environment variables -/// 3. [User config](https://martinvonz.github.io/jj/latest/config/) +/// 3. [User config](https://jj-vcs.github.io/jj/latest/config/) /// 4. Repo config `.jj/repo/config.toml` /// 5. TODO: Workspace config `.jj/config.toml` /// 6. Override environment variables diff --git a/cli/src/config/colors.toml b/cli/src/config/colors.toml index e14763d2d0..6586de33a0 100644 --- a/cli/src/config/colors.toml +++ b/cli/src/config/colors.toml @@ -53,7 +53,7 @@ "working_copy commit_id" = "bright blue" "working_copy change_id" = "bright magenta" # We do not use bright yellow because of how it looks on xterm's default theme. -# https://github.com/martinvonz/jj/issues/528 +# https://github.com/jj-vcs/jj/issues/528 "working_copy author" = "yellow" "working_copy committer" = "yellow" "working_copy timestamp" = "bright cyan" diff --git a/cli/src/ui.rs b/cli/src/ui.rs index d32e19c1de..c97a955a38 100644 --- a/cli/src/ui.rs +++ b/cli/src/ui.rs @@ -183,7 +183,7 @@ impl UiOutput { Possible workarounds: - Use `jj --no-pager` - - Configure a different pager, see https://martinvonz.github.io/jj/latest/windows/#pagination for Git Bash on Windows + - Configure a different pager, see https://jj-vcs.github.io/jj/latest/windows/#pagination for Git Bash on Windows - Use a different terminal (e.g. Windows Terminal or the Command Prompt) - Use `winpty jj ...`; `winpty` comes with Git Bash or Cygwin."# } diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap index de7bbe11db..acb1e46dde 100644 --- a/cli/tests/cli-reference@.md.snap +++ b/cli/tests/cli-reference@.md.snap @@ -111,7 +111,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://martinvonz.github.io/jj/latest/tutorial/. +To get started, see the tutorial at https://jj-vcs.github.io/jj/latest/tutorial/. **Usage:** `jj [OPTIONS] [COMMAND]` @@ -272,7 +272,7 @@ Apply the reverse of a revision on top of another revision Manage bookmarks [default alias: b] -For information about bookmarks, see https://martinvonz.github.io/jj/latest/bookmarks. +For information about bookmarks, see https://jj-vcs.github.io/jj/latest/bookmarks. **Usage:** `jj bookmark ` @@ -316,7 +316,7 @@ Delete an existing bookmark and propagate the deletion to remotes on the next pu * `` — The bookmarks to delete - 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. + By default, the specified name matches exactly. Use `glob:` prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns. @@ -332,7 +332,7 @@ A forgotten bookmark will not impact remotes on future pushes. It will be recrea * `` — The bookmarks to forget - 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. + By default, the specified name matches exactly. Use `glob:` prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns. @@ -342,7 +342,7 @@ List bookmarks and their targets By default, a tracking remote bookmark will be included only if its target is different from the local target. A non-tracking remote bookmark won't be listed. For a conflicted bookmark (both local and remote), old target revisions are preceded by a "-" and new target revisions are preceded by a "+". -For information about bookmarks, see https://martinvonz.github.io/jj/latest/bookmarks/. +For information about bookmarks, see https://jj-vcs.github.io/jj/latest/bookmarks/. **Usage:** `jj bookmark list [OPTIONS] [NAMES]...` @@ -350,7 +350,7 @@ For information about bookmarks, see https://martinvonz.github.io/jj/latest/book * `` — Show bookmarks whose local name matches - 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. + By default, the specified name matches exactly. Use `glob:` prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns. ###### **Options:** @@ -359,7 +359,7 @@ For information about bookmarks, see https://martinvonz.github.io/jj/latest/book Can be combined with `--tracked` or `--conflicted` to filter the bookmarks shown (can be repeated.) - 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. + By default, the specified remote name matches exactly. Use `glob:` prefix to select remotes by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns. * `-t`, `--tracked` — Show remote tracked bookmarks only. Omits local Git-tracking bookmarks by default * `-c`, `--conflicted` — Show conflicted bookmarks only * `-r`, `--revisions ` — Show bookmarks whose local targets are in the given revisions @@ -369,7 +369,7 @@ For information about bookmarks, see https://martinvonz.github.io/jj/latest/book 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/ @@ -391,7 +391,7 @@ $ jj bookmark move --from 'heads(::@- & bookmarks())' --to @- * `` — Move bookmarks matching the given name patterns - 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. + By default, the specified name matches exactly. Use `glob:` prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns. ###### **Options:** @@ -447,7 +447,7 @@ A tracking remote bookmark will be imported as a local bookmark of the same name * `` — Remote bookmarks to track - 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. + By default, the specified name matches exactly. Use `glob:` prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns. Examples: bookmark@remote, glob:main@*, glob:jjfan-*@upstream @@ -465,7 +465,7 @@ A non-tracking remote bookmark is just a pointer to the last-fetched remote book * `` — Remote bookmarks to untrack - 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. + By default, the specified name matches exactly. Use `glob:` prefix to select bookmarks by wildcard pattern. For details, see https://jj-vcs.github.io/jj/latest/revsets/#string-patterns. Examples: bookmark@remote, glob:main@*, glob:jjfan-*@upstream @@ -505,7 +505,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://martinvonz.github.io/jj/latest/config/. +For file locations, supported config options, and other details about jj config, see https://jj-vcs.github.io/jj/latest/config/. **Usage:** `jj config ` @@ -579,7 +579,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://martinvonz.github.io/jj/latest/templates/ + For the syntax, see https://jj-vcs.github.io/jj/latest/templates/ @@ -721,7 +721,7 @@ With the `-r` option, which is the default, starts a [diff editor] on the change With the `--from` and/or `--to` options, starts a [diff editor] comparing the "from" revision to the "to" revision. -[diff editor]: https://martinvonz.github.io/jj/latest/config/#editing-diffs +[diff editor]: 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 updated. Unless `--restore-descendants` is used, descendants will be rebased on top as usual, which may result in conflicts. @@ -775,7 +775,7 @@ Sets the specified revision as the working-copy revision 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 **Usage:** `jj edit ` @@ -802,7 +802,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