A Git-compatible VCS that is both simple and powerful
The default template aliases were replaced as follows:
builtin_op_log_root(op_id: OperationId) ->
format_root_operation(root: Operation)
builtin_log_root(change_id: ChangeId, commit_id: CommitId) ->
format_root_commit(root: Commit)
builtin_change_id_with_hidden_and_divergent_info ->
format_short_change_id_with_hidden_and_divergent_info(commit: Commit)
The --revision option of jj rebase is renamed to --revisions. The short
alias -r is still supported.
The list of conflicted paths is printed whenever the working copy changes.
This can be disabled with the --quiet option.
Commit objects in templates now have a mine() -> Boolean method analog to
the same function in revsets. It evaluates to true if the email of the commit
author matches the current user.email.
Commit objects in templates now have a contained_in(revset: String) -> Boolean method.
Operation objects in templates now have a snapshot() -> Boolean method that
evaluates to true if the operation was a snapshot created by a non-mutating
command (e.g. jj log).
Revsets and templates now support single-quoted raw string literals.
A new config option ui.always-allow-large-revsets has been added to
allow large revsets expressions in some commands, without the all: prefix.
A new config option ui.allow-filesets has been added to enable "fileset"
expressions. Note that filesets are currently experimental,
but will be enabled by default in a future release.
A new global flag --ignore-immutable lets you rewrite immutable commits.
New command jj parallelize that rebases a set of revisions into siblings.
jj status now supports filtering by paths. For example, jj status . will
only list changed files that are descendants of the current directory.
jj prev and jj next now work when the working copy revision is a merge.
jj squash now accepts a --use-destination-message/-u option that uses the
description of the destination for the new squashed revision and discards the
descriptions of the source revisions.
You can check whether Watchman fsmonitor is enabled or installed with the new
jj debug watchman status command.
jj rebase now accepts revsets resolving to multiple revisions with the
--revisions/-r option.
jj rebase -r now accepts --insert-after and --insert-before options to
customize the location of the rebased revisions.
Revsets now support \-escapes in string literal.
The builtin diff editor now allows empty files to be selected during
jj split.
Fixed a bug with jj split introduced in 0.16.0 that caused it to incorrectly
rebase the children of the revision being split if they had other parents
(i.e. if the child was a merge).
The snapshot.max-new-file-size option can now handle raw integer literals,
interpreted as a number of bytes, where previously it could only handle string
literals. This means that snapshot.max-new-file-size="1" and
snapshot.max-new-file-size=1 are now equivalent.
jj squash <path> is now a no-op if the path argument didn't match any paths
(it used to create new commits with bumped timestamp).
#3334
Thanks to the people who made this release happen!
jj move was deprecated in favor of jj squash.The git_head template keyword now returns an optional value instead of a
list of 0 or 1 element.
The jj sparse set --edit/--reset flags were split up into jj sparse edit/reset subcommands respectively.
The jj sparse subcommands now parse and print patterns as workspace-relative
paths.
The jj log command no longer uses the default revset when a path is specified.
Config now supports rgb hex colors (in the form #rrggbb) wherever existing color names are supported.
ui.default-command now accepts multiple string arguments, for more complex
default jj commands.
Graph node symbols are now configurable via templates
templates.log_node
templates.op_log_node
jj log now includes synthetic nodes in the graph where some revisions were
elided.
jj squash now accepts --from and --into (also aliased as --to) if -r
is not specified. It can now be used for all use cases where jj move could
previously be used. The --from argument accepts a revset that resolves to
more than one revision.
Commit templates now support immutable keyword.
New template function coalesce(content, ..) is added.
Timestamps are now shown in local timezone and without milliseconds and timezone offset by default.
jj git push now prints messages from the remote.
jj branch list now supports a --conflicted/-c option to show only conflicted branches.
jj duplicate and jj abandon can now take more than a single -r argument,
for consistency with other commands.
jj branch list now allows combining -r REVISIONS/NAMES and -a options.
--all is now named --all-remotes for jj branch list
There is a new global --quiet flag to silence commands' non-primary output.
jj split now supports a --siblings/-s option that splits the target
revision into siblings with the same parents and children.
new function working_copies() for revsets to show the working copy commits of all workspaces.
None.
Thanks to the people who made this release happen!
No code changes (fixing Rust Cargo.toml stuff).
The minimum supported Rust version (MSRV) is now 1.76.0.
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. If
reindexing failed, you'll need to clean up corrupted operation history by
jj op abandon ..<bad operation ID>.
Dropped support for the "legacy" graph-drawing style. Use "ascii" for a very similar result.
The default log output no longer lists all tagged heads. Set revsets.log = "@ | ancestors(immutable_heads().., 2) | heads(immutable_heads())" to restore
the old behavior.
Dropped support for the deprecated : revset operator. Use :: instead.
jj rebase --skip-empty no longer abandons commits that were already empty
before the rebase.
Partial support for commit signing. Currently you can configure jj to "keep" commit signatures by making new ones for rewritten commits, and to sign new commits when they are created.
This comes with out-of-the-box support for the following backends:
Signature verification and an explicit sign command will hopefully come soon.
Templates now support logical operators: ||, &&, !
Templates now support the self keyword, which is the current commit in jj log/obslog templates.
jj show now accepts -T/--template option to render its output using
template
jj config list now accepts -T/--template option.
jj git fetch now accepts -b as a shorthand for --branch, making it more
consistent with other commands that accept a branch
In the templating language, Timestamps now have a .local() method for
converting to the local timezone.
jj next/prev now infer --edit when you're already editing a non-head
commit (a commit with children).
A new built-in pager named :builtin is available on all platforms,
implemented with minus
Set config ui.log-synthetic-elided-nodes = true to make jj log include
synthetic nodes in the graph where some revisions were elided
(#1252,
#2971). This may become the
default depending on feedback.
When creating a new workspace, the sparse patterns are now copied over from the current workspace.
jj git init --colocate can now import an existing Git repository. This is
equivalent to jj git init --git-repo=..
jj git fetch now automatically prints new remote branches and tags by default.
--verbose/-v is now --debug (no short option since it's not intended to be used often)
jj move --from/--to can now be abbreviated to jj move -f/-t
jj commit/diffedit/move/resolve/split/squash/unsquash now accept
--tool=<NAME> option to override the default.
#2575
Added completions for Nushell to jj util completion
jj branch list now supports a --tracked/-t option which can be used to
show tracked branches only. Omits local Git-tracking branches by default.
Commands producing diffs now accept a --context flag for the number of
lines of context to show.
jj commands with the -T/--template option now provide a hint containing
defined template names when no argument is given, assisting the user in making
a selection.
On Windows, symlinks in the repo are now supported when Developer Mode is enabled. When symlink support is unavailable, they will be materialized as regular files in the working copy (instead of resulting in a crash). #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
Thanks to the people who made this release happen!
jj checkout and jj merge are both deprecated; use jj new instead to
replace both of these commands in all instances.
Rationale: jj checkout and jj merge both implement identical
functionality, which is a subset of jj new. checkout creates a new working
copy commit on top of a single specified revision, i.e. with one parent.
merge creates a new working copy commit on top of at least two specified
revisions, i.e. with two or more parents.
The only difference between these commands and jj new, which also creates
a new working copy commit, is that new can create a working copy commit on
top of any arbitrary number of revisions, so it can handle both the previous
cases at once. The only actual difference between these three commands is the
command syntax and their name. These names were chosen to be familiar to users
of other version control systems, but we instead encourage all users to adopt
jj new instead; it is more general and easier to remember than both of
these.
jj checkout and jj merge will no longer be shown as part of jj help, but
will still function for now, emitting a warning about their deprecation.
Deadline: jj checkout and jj merge will be deleted and are expected
become a hard error later in 2024.
jj init --git and jj init --git-repo are now deprecated and will be removed
in the near future.
Use jj git init instead.
(Minor) Diff summaries (e.g. jj diff -s) now use D for "Deleted" instead
of R for "Removed". @joyously pointed out that R could also mean
"Renamed".
jj util completion now takes the shell as a positional argument, not a flag.
the previous behavior is deprecated, but supported for now. it will be removed
in the future.
jj util completion now supports powershell and elvish.
Official binaries for macOS running on Apple Silicon (aarch64-apple-darwin)
are now available, alongside the existing macOS x86 binaries.
New jj op abandon command is added to clean up the operation history. Git
refs and commit objects can be further compacted by jj util gc.
jj util gc now removes unreachable operation, view, and Git objects.
jj branch rename will now warn if the renamed branch has a remote branch, since
those will have to be manually renamed outside of jj.
jj git push gained a --tracked option, to push all the tracked branches.
There's now a virtual root operation, similar to the virtual root
commit. It appears at the end of jj op log.
jj config list gained a --include-overridden option to allow
printing overridden config values.
jj config list now accepts --user or --repo option to specify
config origin.
New jj config path command to print the config file path without launching
an editor.
jj tag list command prints imported git tags.
jj next and jj prev now prompt in the event of the next/previous commit
being ambiguous, instead of failing outright.
jj resolve now displays the file being resolved.
jj workspace root was aliased to jj root, for ease of discoverability
jj diff no longer shows the contents of binary files.
jj git now has an init command that initializes a git backed repo.
New template function surround(prefix, suffix, content) is added.
Fixed snapshots of symlinks in gitignore-d directory.
#2878
Fixed data loss in dirty working copy when checked-out branch is rebased or abandoned by Git. #2876
Thanks to the people who made this release happen!
jj git fetch no longer imports new remote branches as local branches. Set
git.auto-local-branch = true to restore the old behavior.Information about new and resolved conflicts is now printed by every command.
jj branch has gained a new rename subcommand that allows changing a branch
name atomically. jj branch help rename for details.
Thanks to the people who made this release happen!
The remote_branches() revset no longer includes branches exported to the Git
repository (so called Git-tracking branches.)
jj branch set no longer creates a new branch. Use jj branch create
instead.
jj init --git in an existing Git repository now errors and exits rather than
creating a second Git store.
jj workspace add can now take multiple --revision arguments, which will
create a new workspace with its working-copy commit on top of all the parents,
as if you had run jj new r1 r2 r3 ....
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).
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
without affecting the working copy.
jj rebase now takes the flag --skip-empty, which doesn't copy over commits
that would become empty after a rebase.
There is a new jj util gc command for cleaning up the repository storage.
For now, it simply runs git gc on the backing Git repo (when using the Git
backend).
jj status would disagree
with the actual file content.
#2654
Thanks to the people who made this release happen!
Conflicts are now stored in a different way. Commits written by a new jj
binary will not be read correctly by older jj binaries. The new model
solves some performance problems with the old model. For example, jj log
should be noticeably faster on large repos. You may need to create a new
clone to see the full speedup.
The remote_branches() revset now includes branches exported to the Git
repository (so called Git-tracking branches.) Use
remote_branches(remote=exact:"origin") to query branches of certain remote.
Status messages are now printed to stderr.
jj config set now interprets the value as TOML also if it's a valid TOML
array or table. For example, jj config set --user 'aliases.n' '["new"]'
Remote branches now have tracking or non-tracking flags. The
git.auto-local-branch setting is applied only to newly fetched remote
branches. Existing remote branches are migrated as follows:
If the deduced tracking flags are wrong, use jj branch track/untrack
commands to fix them up.
See automatic local branch creation for details.
Non-tracking remote branches aren't listed by default. Use jj branch list --all to show all local and remote branches.
It's not allowed to push branches if non-tracking remote branches of the same name exist.
Pushing deleted/moved branches no longer abandons the local commits referenced by the remote branches.
jj git fetch --branch now requires glob: prefix to expand * in branch
name.
jj's stable release can now be installed with cargo binstall jj-cli.
jj workspace add now takes a --revision argument.
jj workspace forget can now forget multiple workspaces at once.
branches()/remote_branches()/author()/committer()/description()
revsets now support glob matching.
jj branch delete/forget/list, and jj git push --branch now support
string pattern syntax. The --glob option
is deprecated in favor of glob: pattern.
The branches/tags/git_refs/git_head template keywords now return a
list of RefNames. They were previously pre-formatted strings.
The new template keywords local_branches/remote_branches are added to show
only local/remote branches.
jj workspace add now preserves all parents of the old working-copy commit
instead of just the first one.
jj rebase -r gained the ability to rebase a revision A onto a descendant
of A.
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).
Conflicts in executable files can now be resolved just like conflicts in non-executable files (#1279).
jj new --insert-before and --insert-after now respect immutable revisions
(#2468).
Thanks to the people who made this release happen!
trunk() now exists. If you previously defined
your own trunk() alias it will continue to overwrite the built-in one.
Check revsets.toml and revsets.md
to understand how the function can be adapted.The ancestors() revset function now takes an optional depth argument
to limit the depth of the ancestor set. For example, use jj log -r 'ancestors(@, 5) to view the last 5 commits.
Support for the Watchman filesystem monitor is now bundled by default. Set
core.fsmonitor = "watchman" in your repo to enable.
You can now configure the set of immutable commits via
revset-aliases.immutable_heads(). For example, set it to
"remote_branches() | tags()" to prevent rewriting those those. Their
ancestors are implicitly also immutable.
jj op log now supports --no-graph.
Templates now support an additional escape: \0. This will output a literal
null byte. This may be useful for e.g.
jj log -T 'description ++ "\0"' --no-graph to output descriptions only, but
be able to tell where the boundaries are
jj now bundles a TUI tool to use as the default diff and merge editors. (The
previous default was meld.)
jj split supports the --interactive flag. (This is already the default if
no paths are provided.)
jj commit accepts an optional list of paths indicating a subset of files to
include in the first commit
jj commit accepts the --interactive flag.
Thanks to the people who made this release happen!
The minimum supported Rust version (MSRV) is now 1.71.0.
The storage format of branches, tags, and git refs has changed. Newly-stored repository data will no longer be loadable by older binaries.
The : revset operator is deprecated. Use :: instead. We plan to delete the
: form in jj 0.15+.
The --allow-large-revsets flag for jj rebase and jj new was replaced by
a all: before the revset. For example, use jj rebase -d 'all:foo-'
instead of jj rebase --allow-large-revsets -d 'foo-'.
The --allow-large-revsets flag for jj rebase and jj new can no longer be
used for allowing duplicate destinations. Include the potential duplicates
in a single expression instead (e.g. jj new 'all:x|y').
The push.branch-prefix option was renamed to git.push-branch-prefix.
The default editor on Windows is now Notepad instead of pico.
jj will fail attempts to snapshot new files larger than 1MiB by default. This behavior
can be customized with the snapshot.max-new-file-size config option.
Author and committer signatures now use empty strings to represent unset
names and email addresses. The author/committer template keywords and
methods also return empty strings.
Older binaries may not warn user when attempting to git push commits
with such signatures.
In revsets, the working-copy or remote symbols (such as @, workspace_id@,
and branch@remote) can no longer be quoted as a unit. If a workspace or
branch name contains whitespace, quote the name like "branch name"@remote.
Also, these symbols will not be resolved as revset aliases or function
parameters. For example, author(foo@) is now an error, and the revset alias
'revset-aliases.foo@' = '@' will be failed to parse.
The root revset symbol has been converted to function root().
The ..x revset is now evaluated to root()..x, which means the root commit
is no longer included.
jj git push will now push all branches in the range remote_branches()..@
instead of only branches pointing to @ or @-.
It's no longer allowed to create a Git remote named "git". Use jj git remote rename to rename the existing remote.
#1690
Revset expression like origin/main will no longer resolve to a
remote-tracking branch. Use main@origin instead.
Default template for jj log now does not show irrelevant information
(timestamp, empty, message placeholder etc.) about the root commit.
Commit templates now support the root keyword, which is true for the root
commit and false for every other commit.
jj init --git-repo now works with bare repositories.
jj config edit --user and jj config set --user will now pick a default
config location if no existing file is found, potentially creating parent directories.
jj log output is now topologically grouped.
#242
jj git clone now supports the --colocate flag to create the git repo
in the same directory as the jj repo.
jj restore gained a new option --changes-in to restore files
from a merge revision's parents. This undoes the changes that jj diff -r
would show.
jj diff/log now supports --tool <name> option to generate diffs by
external program. For configuration, see the documentation.
#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
used with jj split, jj move -i, etc.
jj log/obslog/op log now supports --limit N option to show the first
N entries.
Added the ui.paginate option to enable/disable pager usage in commands
jj checkout/jj describe/jj commit/jj new/jj squash can take repeated
-m/--message arguments. Each passed message will be combined into paragraphs
(separated by a blank line)
It is now possible to set a default description using the new
ui.default-description option, to use when describing changes with an empty
description.
jj split will now leave the description empty on the second part if the
description was empty on the input commit.
branches()/remote_branches()/author()/committer()/description()
revsets now support exact matching. For example, branch(exact:main)
selects the branch named "main", but not "maint". description(exact:"")
selects commits whose description is empty.
Revsets gained a new function mine() that aliases author(exact:"your_email").
Added support for :: and .. revset operators with both left and right
operands omitted. These expressions are equivalent to all() and ~root()
respectively.
jj log timestamp format now accepts .utc() to convert a timestamp to UTC.
templates now support additional string methods .starts_with(x), .ends_with(x)
.remove_prefix(x), .remove_suffix(x), and .substr(start, end).
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 for
further pending improvements.
jj diff --stat has been implemented. It shows a histogram of the changes,
same as git diff --stat. Fixes #2066
jj git fetch --all-remotes has been implemented. It fetches all remotes
instead of just the default remote
Fix issues related to .gitignore handling of untracked directories #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
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
Thanks to the people who made this release happen!