Releases: jj-vcs/jj
v0.16.0
Deprecations
jj move
was deprecated in favor ofjj squash
.
Breaking changes
-
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 intojj 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.
New features
-
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
defaultjj
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 wherejj 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
andjj 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
forjj 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.
Fixed bugs
None.
Contributors
Thanks to the people who made this release happen!
- Aleksey Kuznetsov (@zummenix)
- Anton Älgmyr (@algmyr)
- Austin Seipp (@thoughtpolice)
- Benjamin Tan (@bnjmnt4n)
- Chris Krycho (@chriskrycho)
- Christoph Koehler (@ckoehler)
- Daniel Ploch (@torquestomp)
- Evan Mesterhazy (@emesterhazy)
- Ilya Grigoriev (@ilyagr)
- Khionu Sybiern (@khionu)
- Martin von Zweigbergk (@martinvonz)
- Matthew Davidson (@KingMob)
- mrstanwell (@mrstanwell)
- Noah Mayr (@noahmayr)
- Patric Stout (@TrueBrain)
- Poliorcetics (@poliorcetics)
- Simon Wollwage (@Kintaro)
- Steve Klabnik (@steveklabnik)
- Tom Ward (@tomafro)
- TrashCan (@TrashCan69420)
- Yuya Nishihara (@yuja)
v0.15.1
No code changes (fixing Rust Cargo.toml stuff).
v0.15.0
Breaking changes
-
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.
New features
-
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:
- GnuPG
- SSH
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 injj 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 makejj 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 tojj 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 tojj 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.
Fixed bugs
-
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
Contributors
Thanks to the people who made this release happen!
- Aleksey Kuznetsov (@zummenix)
- Anton Bulakh (@necauqua)
- Anton Älgmyr (@algmyr)
- Austin Seipp (@thoughtpolice)
- Benjamin Brittain (@benbrittain)
- Benjamin Tan (@bnjmnt4n)
- Daehyeok Mun (@daehyeok)
- Daniel Ploch (@torquestomp)
- Evan Mesterhazy (@emesterhazy)
- gulbanana (@gulbanana)
- Ilya Grigoriev (@ilyagr)
- Jonathan Tan (@jonathantanmy)
- Julien Vincent (@julienvincent)
- jyn (@jyn514)
- Martin von Zweigbergk (@martinvonz)
- Paulo Coelho (@prscoelho)
- Philip Metzger (@PhilipMetzger)
- Poliorcetics (@poliorcetics)
- Stephen Jennings (@jennings)
- Vladimir (@0xdeafbeef)
- Yuya Nishihara (@yuja)
v0.14.0
Deprecations
-
jj checkout
andjj merge
are both deprecated; usejj new
instead to
replace both of these commands in all instances.Rationale:
jj checkout
andjj merge
both implement identical
functionality, which is a subset ofjj 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 thatnew
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
andjj merge
will no longer be shown as part ofjj help
, but
will still function for now, emitting a warning about their deprecation.Deadline:
jj checkout
andjj merge
will be deleted and are expected
become a hard error later in 2024. -
jj init --git
andjj init --git-repo
are now deprecated and will be removed
in the near future.Use
jj git init
instead.
Breaking changes
-
(Minor) Diff summaries (e.g.
jj diff -s
) now useD
for "Deleted" instead
ofR
for "Removed". @joyously pointed out thatR
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.
New features
-
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 byjj 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 ofjj
. -
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 ofjj 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
andjj 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 tojj root
, for ease of discoverability -
jj diff
no longer shows the contents of binary files. -
jj git
now has aninit
command that initializes a git backed repo. -
New template function
surround(prefix, suffix, content)
is added.
Fixed bugs
-
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
Contributors
Thanks to the people who made this release happen!
- Austin Seipp (@thoughtpolice)
- Benjamin Brittain (@benbrittain)
- Chris Krycho (@chriskrycho)
- Daehyeok Mun (@daehyeok)
- Daniel Ploch (@torquestomp)
- Essien Ita Essien (@essiene)
- Ikko Eltociear Ashimine (@eltociear)
- Ilya Grigoriev (@ilyagr)
- Jonathan Tan (@jonathantanmy)
- jyn (@jyn514)
- Martin von Zweigbergk (@martinvonz)
- Matt Stark (@matts1)
- Michael Pratt (prattmic)
- Philip Metzger (@PhilipMetzger)
- Stephen Jennings (@jennings)
- Valentin Gatien-Baron (@v-gb)
- vwkd (@vwkd)
- Yuya Nishihara (@yuja)
v0.13.0
Breaking changes
jj git fetch
no longer imports new remote branches as local branches. Set
git.auto-local-branch = true
to restore the old behavior.
New features
-
Information about new and resolved conflicts is now printed by every command.
-
jj branch
has gained a newrename
subcommand that allows changing a branch
name atomically.jj branch help rename
for details.
Fixed bugs
- Command aliases can now be loaded from repository config relative to the
current working directory.
#2414
Contributors
Thanks to the people who made this release happen!
- Austin Seipp (@thoughtpolice)
- Essien Ita Essien (@essiene)
- Gabriel Scherer (@gasche)
- Ilya Grigoriev (@ilyagr)
- Martin von Zweigbergk (@martinvonz)
- Philip Metzger (@PhilipMetzger)
- Waleed Khan (@arxanas)
- Yuya Nishihara (@yuja)
v0.12.0
Breaking changes
-
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. Usejj branch create
instead. -
jj init --git
in an existing Git repository now errors and exits rather than
creating a second Git store.
New features
-
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 runjj 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 runsgit gc
on the backing Git repo (when using the Git
backend).
Fixed bugs
- Fixed another file conflict resolution issue where
jj status
would disagree
with the actual file content.
#2654
Contributors
Thanks to the people who made this release happen!
- Antoine Cezar (@AntoineCezar)
- Anton Bulakh (@necauqua)
- Austin Seipp (@thoughtpolice)
- Benjamin Saunders (@Ralith)
- Carlos Precioso (@cprecioso)
- Chris Krycho (@chriskrycho)
- Ilya Grigoriev (@ilyagr)
- Jason R. Coombs (@jaraco)
- Jesse Somerville (@jessesomerville)
- Łukasz Kurowski (@crackcomm)
- Martin von Zweigbergk (@martinvonz)
- mlcui (@mlcui-google)
- Philip Metzger (@PhilipMetzger)
- Waleed Khan (@arxanas)
- Yuya Nishihara (@yuja)
v0.11.0
Breaking changes
-
Conflicts are now stored in a different way. Commits written by a new
jj
binary will not be read correctly by olderjj
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 local branch exists, the corresponding remote branches are considered
tracking branches. - Otherwise, the remote branches are non-tracking branches.
If the deduced tracking flags are wrong, use
jj branch track
/untrack
commands to fix them up.See automatic local branch creation
for details. - If local branch exists, the corresponding remote branches are considered
-
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 requiresglob:
prefix to expand*
in branch
name.
New features
-
jj
's stable release can now be installed withcargo 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
, andjj git push --branch
now support
string pattern syntax. The--glob
option
is deprecated in favor ofglob:
pattern. -
The
branches
/tags
/git_refs
/git_head
template keywords now return a
list ofRefName
s. 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 revisionA
onto a descendant
ofA
.
Fixed bugs
-
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).
Contributors
Thanks to the people who made this release happen!
- Antoine Cezar (@AntoineCezar)
- Austin Seipp (@thoughtpolice)
- Benjamin Saunders (@Ralith)
- Gabriel Scherer (@gasche)
- Ilya Grigoriev (@ilyagr)
- Infra (@1011X)
- Isabella Basso (@isinyaaa)
- Martin von Zweigbergk (@martinvonz)
- Tal Pressman (@talpr)
- Waleed Khan (@arxanas)
- Yuya Nishihara (@yuja)
v0.10.0
Breaking changes
- A default revset-alias function
trunk()
now exists. If you previously defined
your owntrunk()
alias it will continue to overwrite the built-in one.
Check revsets.toml and revsets.md
to understand how the function can be adapted.
New features
-
The
ancestors()
revset function now takes an optionaldepth
argument
to limit the depth of the ancestor set. For example, usejj 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 wasmeld
.) -
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.
Fixed bugs
Contributors
Thanks to the people who made this release happen!
- Austin Seipp (@thoughtpolice)
- Emily Kyle Fox (@emilykfox)
- glencbz (@glencbz)
- Hong Shin (@honglooker)
- Ilya Grigoriev (@ilyagr)
- James Sully (@sullyj3)
- Martin von Zweigbergk (@martinvonz)
- Philip Metzger (@PhilipMetzger)
- Ruben Slabbert (@rslabbert)
- Vamsi Avula (@avamsi)
- Waleed Khan (@arxanas)
- Willian Mori (@wmrmrx))
- Yuya Nishihara (@yuja)
- Zachary Dremann (@Dr-Emann)
v0.9.0
Breaking changes
-
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 forjj rebase
andjj new
was replaced by
aall:
before the revset. For example, usejj rebase -d 'all:foo-'
instead ofjj rebase --allow-large-revsets -d 'foo-'
. -
The
--allow-large-revsets
flag forjj rebase
andjj 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 togit.push-branch-prefix
. -
The default editor on Windows is now
Notepad
instead ofpico
. -
jj
will fail attempts to snapshot new files larger than 1MiB by default. This behavior
can be customized with thesnapshot.max-new-file-size
config option. -
Author and committer signatures now use empty strings to represent unset
names and email addresses. Theauthor
/committer
template keywords and
methods also return empty strings.
Older binaries may not warn user when attempting togit push
commits
with such signatures. -
In revsets, the working-copy or remote symbols (such as
@
,workspace_id@
,
andbranch@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 functionroot()
. -
The
..x
revset is now evaluated toroot()..x
, which means the root commit
is no longer included. -
jj git push
will now push all branches in the rangeremote_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. Usemain@origin
instead.
New features
-
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 istrue
for the root
commit andfalse
for every other commit. -
jj init --git-repo
now works with bare repositories. -
jj config edit --user
andjj 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 thatjj 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 withjj 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 aliasesauthor(exact:"your_email")
. -
Added support for
::
and..
revset operators with both left and right
operands omitted. These expressions are equivalent toall()
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
andjj prev
are added, these allow you to traverse the history
in a linear style. For people coming from Sapling andgit-branchles
see #2126 for
further pending improvements. -
jj diff --stat
has been implemented. It shows a histogram of the changes,
same asgit diff --stat
. Fixes #2066 -
jj git fetch --all-remotes
has been implemented. It fetches all remotes
instead of just the default remote
Fixed bugs
-
Fix issues related to .gitignore handling of untracked directories
#2051. -
jj config set --user
andjj 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
Contributors
Thanks to the people who made this release happen!
- Alexander Potashev (@aspotashev)
- Anton Bulakh (@necauqua)
- Austin Seipp (@thoughtpolice)
- Benjamin Brittain (@benbrittain)
- Benjamin Saunders (@Ralith)
- Christophe Poucet (@poucet)
- Emily Kyle Fox (@emilykfox)
- Glen Choo (@chooglen)
- Ilya Grigoriev (@ilyagr)
- Kevin Liao (@kevincliao)
- Linus Arver (@listx)
- Martin Clausen (@maacl)
- Martin von Zweigbergk (@martinvonz)
- Matt Freitas-Stavola (@mbStavola)
- Oscar Bonilla (@ob)
- Philip Metzger (@PhilipMetzger)
- Piotr Kufel (@qfel)
- Preston Van Loon (@prestonvanloon)
- Tal Pressman (@talpr)
- Vamsi Avula (@avamsi)
- Vincent Breitmoser (@Valodim)
- Vladimir (@0xdeafbeef)
- Waleed Khan (@arxanas)
- Yuya Nishihara (@yuja)
- Zachary Dremann (@Dr-Emann)
v0.8.0
Breaking changes
-
The
jujutsu
andjujutsu-lib
crates were renamed tojj-cli
andjj-lib
,
respectively. -
The
ui.oplog-relative-timestamps
option has been removed. Use the
format_time_range()
template alias instead. For details, see
the documentation. -
Implicit concatenation of template expressions has been disabled. Use
++
operator,concat()
, orseparate()
function instead.
Example:description ++ "\n"
-
jj git push
will consider pushing the parent commit only when the
current commit has no content and no description, such as right after
ajj squash
. -
The minimum supported Rust version (MSRV) is now 1.64.0.
-
The
heads()
revset function was split up into two functions.heads()
without arguments is now calledvisible_heads()
.heads()
with one argument
is unchanged. -
The
ui.default-revset
config was renamed torevsets.log
. -
The
jj sparse
command was split up intojj sparse list
and
jj sparse set
. -
jj hide
(alias forjj abandon
) is no longer available. Usejj abandon
instead. -
jj debug completion
,jj debug mangen
andjj debug config-schema
have
been moved fromjj debug
tojj util
. -
jj
will no longer parsebr
as a git_refrefs/heads/br
when a branchbr
does not exist but the git_ref does (this is rare). Usebr@git
instead. -
jj git fetch
will no longer import unrelated branches from the underlying
Git repo.
New features
-
jj git push --deleted
will remove all locally deleted branches from the remote. -
jj restore
without--from
works correctly even if@
is a merge
commit. -
jj rebase
now accepts multiple-s
and-b
arguments. Revsets with
multiple commits are allowed with--allow-large-revsets
. -
jj git fetch
now supports a--branch
argument to fetch some of the
branches only. -
jj config get
command allows retrieving config values for use in scripting. -
jj config set
command allows simple config edits like
jj config set --repo user.email "[email protected]"
-
Added
ui.log-word-wrap
option to wrapjj log
/obslog
/op log
content
based on terminal width. #1043 -
Nodes in the (text-based) graphical log output now use a
◉
symbol instead
of the lettero
. The ASCII-based graph styles still useo
. -
Commands that accept a diff format (
jj diff
,jj interdiff
,jj show
,
jj log
, andjj obslog
) now accept--types
to show only the type of file
before and after. -
jj describe
now supports--reset-author
for resetting a commit's author
to the configured user.jj describe
also gained a--no-edit
option to
avoid opening the editor. -
Added
latest(x[, n])
revset function to select the latestn
commits. -
Added
conflict()
revset function to select commits with conflicts. -
jj squash
AKAjj amend
now accepts a--message
option to set the
description of the squashed commit on the command-line. -
The progress display on
jj git clone/fetch
now includes the downloaded size. -
The formatter now supports a "default" color that can override another color
defined by a parent style. -
jj obslog
andjj log
now show abandoned commits as hidden. -
jj git fetch
andjj git push
will now use the single defined remote even
if it is not named "origin". -
jj git push
now accepts--branch
and--change
arguments together. -
jj git push
now accepts a-r/--revisions
flag to specify revisions to
push. All branches pointing to any of the specified revisions will be pushed.
The flag can be used together with--branch
and--change
. -
jj
with no subcommand now defaults tojj log
instead of showing help. This
command can be overridden by settingui.default-command
. -
Description tempfiles created via
jj describe
now have the file extension
.jjdescription
to help external tooling detect a unique filetype. -
The shortest unique change ID prefixes and commit ID prefixes in
jj log
are
now shorter within the default log revset. You can override the default by
setting therevsets.short-prefixes
config to a different revset. -
The last seen state of branches in the underlying git repo is now presented by
jj branch list
/jj log
as a remote calledgit
(e.g.main@git
). They can
also be referenced in revsets. Such branches exist in colocated repos or if
you usejj git export
. -
The new
jj chmod
command allows setting or removing the executable bit on
paths. Unlike the POSIXchmod
, it works on Windows, on conflicted files, and
on arbitrary revisions. Bits other than the executable bit are not planned to
be supported. -
jj sparse set
now accepts an--edit
flag which brings up the$EDITOR
to
edit sparse patterns. -
jj branch list
can now be filtered by revset. -
Initial support for the Watchman filesystem monitor. Set
core.fsmonitor = "watchman"
in your repo to enable.
Fixed bugs
-
Modify/delete conflicts now include context lines
#1244. -
It is now possible to modify either side of a modify/delete conflict (any
change used to be considered a resolution). -
Fixed a bug that could get partially resolved conflicts to be interpreted
incorrectly. -
jj git fetch
: when re-adding a remote repository that had been previously
removed, in some situations the remote branches were not recreated. -
jj git remote rename
: the git remote references were not rewritten with
the new name. If a new remote with the old name and containing the same
branches was added, the remote branches may not be recreated in some cases. -
jj workspace update-stale
now snapshots the working-copy changes before
updating to the new working-copy commit. -
It is no longer allowed to create branches at the root commit.
-
git checkout
(without usingjj
) in colocated repo no longer abandons
the previously checked-out anonymous branch.
#1042. -
jj git fetch
in a colocated repo now abandons branches deleted on the
remote, just like in a non-colocated repo.
#864 -
jj git fetch
can now fetch forgotten branches even if they didn't move on
the remote.
#1714
#1771 -
It is now possible to
jj branch forget
deleted branches.
#1537 -
Fixed race condition when assigning change id to Git commit. If you've
already had unreachable change ids, runjj debug reindex
.
#924 -
Fixed false divergence on racy working-copy snapshots.
#697,
#1608 -
In colocated repos, a bug causing conflicts when undoing branch moves (#922)
has been fixed. Some surprising behaviors related to undoingjj git push
or
jj git fetch
remain.
Contributors
Thanks to the people who made this release happen!
- Aaron Bull Schaefer (@elasticdog)
- Anton Bulakh (@necauqua)
- Austin Seipp (@thoughtpolice)
- Benjamin Saunders (@Ralith)
- B Wilson (@xelxebar)
- Christophe Poucet (@poucet)
- David Barnett (@dbarnett)
- Glen Choo (@chooglen)
- Grégoire Geis (@71)
- Ilya Grigoriev (@ilyagr)
- Isabella Basso (@isinyaaa)
- Kevin Liao (@kevincliao)
- Martin von Zweigbergk (@martinvonz)
- mlcui (@mlcui-google)
- Samuel Tardieu (@samueltardieu)
- Tal Pressman (@talpr)
- Vamsi Avula (@avamsi)
- Waleed Khan (@arxanas)
- Yuya Nishihara (@yuja)