A Git-compatible VCS that is both simple and powerful
APACHE-2.0 License
In revset aliases, top-level kind:pattern
expression is now parsed as
modifier. Surround with parentheses if it should be parsed as string/file
pattern.
Dropped support for automatic upgrade of repo formats used by versions before
0.12.0.
jj fix
now defaults to the broader revset -s reachable(@, mutable())
instead of -s @
.
Dropped support for deprecated jj branch delete
/forget
--glob
option.
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
Replacing -l
shorthand for --limit
with -n
in jj log
, jj op log
and jj obslog
.
jj split --siblings
is deprecated in favor of jj split --parallel
(to
match jj parallelize
).
A new jj file
subcommand now replaces several existing uncategorized
commands, which are deprecated.
jj file show
replaces jj cat
.jj file chmod
replaces jj chmod
.jj file list
replaces jj files
.Support background filesystem monitoring via watchman triggers enabled with
the core.watchman.register_snapshot_trigger = true
config.
Show paths to config files when configuration errors occur.
jj fix
now supports configuring the default revset for -s
using the
revsets.fix
config.
The descendants()
revset function now accepts an optional depth
argument;
like the ancestors()
depth argument, it limits the depth of the set.
Revset/template aliases now support function overloading.
#2966
Conflicted files are individually simplified before being materialized.
The jj file
subcommand now contains several existing file utilities.
jj file show
, replacing jj cat
.jj file chmod
replacing jj chmod
.jj file list
replacing jj files
.New command jj branch move
let you update branches by name pattern or source
revision.
New diff option jj diff --name-only
allows for easier shell scripting.
In color-words diffs, hunks are now highlighted with underline. See diff
colors and styles for customization.
jj git push -c <arg>
can now accept revsets that resolve to multiple
revisions. This means that jj git push -c xyz -c abc
is now equivalent to
jj git push -c 'all:(xyz | abc)'
.
jj prev
and jj next
have gained a --conflict
flag which moves you
to the next conflict in a child commit.
New command jj git remote set-url
that sets the url of a git remote.
Author timestamp is now reset when rewriting discardable commits (empty
commits with no description) if authored by the current user.
#2000
jj commit
now accepts --reset-author
option to match jj describe
.
jj squash
now accepts a --keep-emptied
option to keep the source commit.
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
jj
will look for divergent changes outside the short prefix set even if it
finds the change id inside the short prefix set.
#2476
Thanks to the people who made this release happen!
Published by martinvonz 5 months ago
Dropped support for ui.default-revset
config (replaced by revsets.log
in
0.8.0).
The commit_summary_no_branches
template is superseded by
templates.branch_list
.
jj split
will now refuse to split an empty commit.
jj config list
now uses multi-line strings and single-quoted strings in the
output when appropriate.
jj config get
/list
/set
now parse name
argument as TOML
key. Quote meta characters as needed.
Example: jj config get "revset-aliases.'trunk()'"
When updating the working copy away from an empty and undescribed commit, it
is now abandoned even if it is a merge commit.
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
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
were global flags and specifying them once would insert the new commit before/
after all the specified commits.
jj branch list
/tag list
now accept -T
/--template
option. The tag list
prints commit summary along with the tag name by default.
Conflict markers now include an explanation of what each part of the conflict
represents.
ui.color = "debug"
prints active labels alongside the regular colored output.
jj branch track
now show conflicts if there are some.
A new revset reachable(srcs, domain)
will return all commits that are
reachable from srcs
within domain
.
There are now prebuilt binaries for aarch64-linux-unknown-musl
.
Note, these are cross compiled and currently untested.
We plan on providing fully tested builds later once our CI system allows it.
Added new revsets mutable()
and immutable()
.
Upgraded scm-record
from v0.2.0 to v0.3.0. See release notes at
https://github.com/arxanas/scm-record/releases/tag/v0.3.0
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 and
#3801).
jj new
's --insert-before
and --insert-after
options can now be used
simultaneously.
jj git push
now can push commits with empty descriptions with the
--allow-empty-description
flag
Previously, jj git push
only made sure that the branch is in the expected
location on the remote server when pushing a branch forward (as opposed to
sideways or backwards). Now, jj git push
makes a safety check in all cases
and fails whenever jj git fetch
would have introduced a conflict.
In other words, previously branches that moved sideways or backward were
pushed similarly to Git's git push --force
; now they have protections
similar to git push --force-with-lease
(though not identical to it, to match
the behavior of jj git fetch
). Note also that because of the way jj git fetch
works, jj
does not suffer from the same problems as Git's git push --force-with-lease
in situations when git fetch
is run in the background.
When the working copy commit becomes immutable, a new one is automatically created
on top of it to avoid letting the user edit the immutable one.
jj config list
now properly escapes TOML keys (#1322).
Files with conflicts are now checked out as executable if all sides of the
conflict are executable.
The progress bar (visible when using e.g. jj git clone
) clears the
remainder of the cursor row after drawing rather than clearing the entire row
before drawing, eliminating the "flicker" effect seen on some terminals.
Thanks to the people who made this release happen!
Published by martinvonz 6 months ago
jj status
no longer scans through the entire history to look for ancestors with conflicts.Published by martinvonz 6 months ago
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!
Published by martinvonz 7 months ago
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!
Published by martinvonz 8 months ago
No code changes (fixing Rust Cargo.toml stuff).
Published by martinvonz 8 months ago
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!
Published by martinvonz 9 months ago
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!
Published by martinvonz 10 months ago
jj git fetch
no longer imports new remote branches as local branches. Setgit.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!
Published by martinvonz 11 months ago
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 disagreeThanks to the people who made this release happen!
Published by martinvonz 12 months ago
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 RefName
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 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!
Published by martinvonz about 1 year ago
trunk()
now exists. If you previously definedtrunk()
alias it will continue to overwrite the built-in one.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!
Published by martinvonz about 1 year ago
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!
Published by martinvonz over 1 year ago
The jujutsu
and jujutsu-lib
crates were renamed to jj-cli
and jj-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()
, or separate()
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
a jj 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 called visible_heads()
. heads()
with one argument
is unchanged.
The ui.default-revset
config was renamed to revsets.log
.
The jj sparse
command was split up into jj sparse list
and
jj sparse set
.
jj hide
(alias for jj abandon
) is no longer available. Use jj abandon
instead.
jj debug completion
, jj debug mangen
and jj debug config-schema
have
been moved from jj debug
to jj util
.
jj
will no longer parse br
as a git_ref refs/heads/br
when a branch br
does not exist but the git_ref does (this is rare). Use br@git
instead.
jj git fetch
will no longer import unrelated branches from the underlying
Git repo.
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 wrap jj 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 letter o
. The ASCII-based graph styles still use o
.
Commands that accept a diff format (jj diff
, jj interdiff
, jj show
,
jj log
, and jj 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 latest n
commits.
Added conflict()
revset function to select commits with conflicts.
jj squash
AKA jj 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
and jj log
now show abandoned commits as hidden.
jj git fetch
and jj 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 to jj log
instead of showing help. This
command can be overridden by setting ui.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 the revsets.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 called git
(e.g. main@git
). They can
also be referenced in revsets. Such branches exist in colocated repos or if
you use jj git export
.
The new jj chmod
command allows setting or removing the executable bit on
paths. Unlike the POSIX chmod
, 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.
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 using jj
) 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, run jj 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 undoing jj git push
or
jj git fetch
remain.
Thanks to the people who made this release happen!
Published by martinvonz over 1 year ago
The minimum supported Rust version (MSRV) is now 1.61.0.
The jj touchup
command was renamed to jj diffedit
.
The -i
option to jj restore
was removed in favor of new --from
/--to
options to jj diffedit
.
To report the situation when a change id corresponds to multiple visible
commits, jj log
now prints the change id in red and puts ??
after it.
Previously, it printed the word "divergent".
jj log
prefixes commit descriptions with "(empty)" when they contain no
change compared to their parents.
The author
/committer
templates now display both name and email. Use
author.name()
/committer.name()
to extract the name.
Storage of the "HEAD@git" reference changed and can now have conflicts.
Operations written by a new jj
binary will have a "HEAD@git" reference that
is not visible to older binaries.
The description
template keyword is now empty if no description set.
Use if(description, description, "(no description set)\n")
to get back
the previous behavior.
The template.log.graph
and template.commit_summary
config keys were
renamed to templates.log
and templates.commit_summary
respectively.
If a custom templates.log
template is set, working-copy commit will
no longer be highlighted automatically. Wrap your template with
label(if(current_working_copy, "working_copy"), ...)
to label the
working-copy entry.
The ui.relative-timestamps
option has been removed. Use the
format_timestamp()
template alias instead. For details on showing relative
timestamps in jj log
and jj show
, see the documentation.
jj op log
now shows relative timestamps by default. To disable, set
ui.oplog-relative-timestamps
to false
.
The global --no-commit-working-copy
is now called --ignore-working-copy
.
The diff.format
config option is now called ui.diff.format
. The old name
is still supported for now.
merge-tools.<name>.edit-args
now requires $left
/$right
parameters.
The default is edit-args = ["$left", "$right"]
.
The builtin jj update
and jj up
aliases for jj checkout
have been
deleted.
Change IDs are now rendered using letters from the end of the alphabet (from
'z' through 'k') instead of the usual hex digits ('0' through '9' and 'a'
through 'f'). This is to clarify the distinction between change IDs and commit
IDs, and to allow more efficient lookup of unique prefixes. This change
doesn't affect the storage format; existing repositories will remain usable.
The default log format now uses the committer timestamp instead of the author
timestamp.
jj log --summary --patch
now shows both summary and diff outputs.
jj git push
now accepts multiple --branch
/--change
arguments
jj config list
command prints values from config and config edit
opens
the config in an editor.
jj debug config-schema
command prints out JSON schema for the jj TOML config
file format.
jj resolve --list
can now describe the complexity of conflicts.
jj resolve
now notifies the user of remaining conflicts, if any, on success.
This can be prevented by the new --quiet
option.
Per-repository configuration is now read from .jj/repo/config.toml
.
Background colors, bold text, and underlining are now supported. You can set
e.g. color.error = { bg = "red", bold = true, underline = true }
in your
~/.jjconfig.toml
.
The empty
condition in templates is true when the commit makes no change to
the three compared to its parents.
branches([needle])
revset function now takes needle
as an optional
argument and matches just the branches whose name contains needle
.
remote_branches([branch_needle[, remote_needle]])
now takes branch_needle
and remote_needle
as optional arguments and matches just the branches whose
name contains branch_needle
and remote contains remote_needle
.
jj git fetch
accepts repeated --remote
arguments.
Default remotes can be configured for the jj git fetch
and jj git push
operations ("origin" by default) using the git.fetch
and git.push
configuration entries. git.fetch
can be a list if multiple remotes must
be fetched from.
jj duplicate
can now duplicate multiple changes in one go. This preserves
any parent-child relationships between them. For example, the entire tree of
descendants of abc
can be duplicated with jj duplicate abc:
.
jj log
now highlights the shortest unique prefix of every commit and change
id and shows the rest in gray. To customize the length and style, use the
format_short_id()
template alias. For details, see
the documentation.
jj print
was renamed to jj cat
. jj print
remains as an alias.
In content that goes to the terminal, the ANSI escape byte (0x1b) is replaced
by a "␛" character. That prevents them from interfering with the ANSI escapes
jj itself writes.
jj workspace root
prints the root path of the current workspace.
The [alias]
config section was renamed to [aliases]
. The old name is
still accepted for backwards compatibility for some time.
Commands that draw an ASCII graph (jj log
, jj op log
, jj obslog
) now
have different styles available by setting e.g. ui.graph.style = "curved"
.
jj split
accepts creating empty commits when given a path. jj split .
inserts an empty commit between the target commit and its children if any,
and jj split any-non-existent-path
inserts an empty commit between the
target commit and its parents.
Command arguments to ui.diff-editor
/ui.merge-editor
can now be specified
inline without referring to [merge-tools]
table.
jj rebase
now accepts a new --allow-large-revsets
argument that allows the
revset in the -d
argument to expand to several revisions. For example,
jj rebase -s B -d B- -d C
now works even if B
is a merge commit.
jj new
now also accepts a --allow-large-revsets
argument that behaves
similarly to jj rebase --allow-large-revsets
.
jj new --insert-before
inserts the new commit between the target commit and
its parents.
jj new --insert-after
inserts the new commit between the target commit and
its children.
author
/committer
templates now support .username()
, which leaves out the
domain information of .email()
.
It is now possible to change the author format of jj log
with the
format_short_signature()
template alias. For details, see
the documentation.
Added support for template aliases. New symbols and functions can be
configured by template-aliases.<name> = <expression>
. Be aware that
the template syntax isn't documented yet and is likely to change.
When sharing the working copy with a Git repo, we used to forget to export
branches to Git when only the working copy had changed. That's now fixed.
Commit description set by -m
/--message
is now terminated with a newline
character, just like descriptions set by editor are.
The -R
/--repository
path must be a valid workspace directory. Its
ancestor directories are no longer searched.
Fixed a crash when trying to access a commit that's never been imported into
the jj repo from a Git repo. They will now be considered as non-existent if
referenced explicitly instead of crashing.
Fixed handling of escaped characters in .gitignore (only keep trailing spaces
if escaped properly).
jj undo
now works after jj duplicate
.
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.
Fix the output of jj debug completion --help
by reversing fish and zsh text.
Fixed edge case in jj git fetch
when a pruned branch is a prefix of another
branch.
Thanks to the people who made this release happen!
Published by martinvonz almost 2 years ago
No changes, only changed to a released version of the thrift
crate dependency.
Published by martinvonz almost 2 years ago
Dropped candidates set argument from description(needle)
, author(needle)
,
committer(needle)
, merges()
revsets. Use x & description(needle)
instead.
Adjusted precedence of revset union/intersection/difference operators.
x | y & z
is now equivalent to x | (y & z)
.
Support for open commits has been dropped. The ui.enable-open-commits
config
that was added in 0.5.0 is no longer respected. The jj open/close
commands
have been deleted.
jj commit
is now a separate command from jj close
(which no longer
exists). The behavior has changed slightly. It now always asks for a
description, even if there already was a description set. It now also only
works on the working-copy commit (there's no -r
argument).
If a workspace's working-copy commit has been updated from another workspace,
most commands in that workspace will now fail. Use the new
jj workspace update-stale
command to update the workspace to the new
working-copy commit. (The old behavior was to automatically update the
workspace.)
Commands with long output are paginated.
#9
The new jj git remote rename
command allows git remotes to be renamed
in-place.
The new jj resolve
command allows resolving simple conflicts with
an external 3-way-merge tool.
jj git push
will search @-
for branches to push if @
has none.
The new revset function file(pattern..)
finds commits modifying the
paths specified by the pattern..
.
The new revset function empty()
finds commits modifying no files.
Added support for revset aliases. New symbols and functions can be configured
by revset-aliases.<name> = <expression>
.
It is now possible to specify configuration options on the command line
with the new --config-toml
global option.
jj git
subcommands will prompt for credentials when required for HTTPS
remotes rather than failing.
#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
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
that is generally more convenient, and it reduces the risk of creating
divergent commits.
The username and hostname that appear in the operation log are now
configurable via config options operation.username
and operation.hostname
.
jj git
subcommands now support credential helpers.
jj log
will warn if it appears that the provided path was meant to be a
revset.
The new global flag -v/--verbose
will turn on debug logging to give
some additional insight into what is happening behind the scenes.
Note: This is not comprehensively supported by all operations yet.
jj log
, jj show
, and jj obslog
now all support showing relative
timestamps by setting ui.relative-timestamps = true
in the config file.
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
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
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.
We now print a warning about these branches instead.
jj edit root
now fails gracefully.
jj git import
used to abandon a commit if Git branches and tags referring
to it were removed. We now keep it if a detached HEAD refers to it.
jj git import
no longer crashes when all Git refs are removed.
Git submodules are now ignored completely. Earlier, files present in the
submodule directory in the working copy would become added (tracked), and
later removed if you checked out another commit. You can now use git
to
populate the submodule directory and jj
will leave it alone.
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
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
now lists all parents and the diff summary is against the auto-merged parents.
Thanks to the people who made this release happen!
Published by martinvonz about 2 years ago
No changes compared to v0.5.0.
Published by martinvonz about 2 years ago
Open commits are now disabled by default. That means that jj checkout
will
always create a new change on top of the specified commit and will let you
edit that in the working copy. Set ui.enable-open-commits = true
to restore
the old behavior and let us know that you did so we know how many people
prefer the workflow with open commits.
jj [op] undo
and jj op restore
used to take the operation to undo or
restore to as an argument to -o/--operation
. It is now a positional
argument instead (i.e. jj undo -o abc123
is now written jj undo abc123
).
An alias that is not configured as a string list (e.g. my-status = "status"
instead of my-status = ["status"]
) is now an error instead of a warning.
jj log
now defaults to showing only commits that are not on any remote
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.
#250
jj new
now always checks out the new commit (used to be only if the parent
was @
).
jj merge
now checks out the new commit. The command now behaves exactly
like jj new
, except that it requires at least two arguments.
When the working-copy commit is abandoned by jj abandon
and the parent
commit is open, a new working-copy commit will be created on top (the open
parent commit used to get checked out).
jj branch
now uses subcommands like jj branch create
and
jj branch forget
instead of options like jj branch --forget
.
#330
The $NO_COLOR
environment variable no longer
overrides the ui.color
configuration if explicitly set.
jj edit
has been renamed to jj touchup
, and jj edit
is now a new command
with different behavior. The new jj edit
lets you edit a commit in the
working copy, even if the specified commit is closed.
jj git push
no longer aborts if you attempt to push an open commit (but it
now aborts if a commit does not have a description).
jj git push
now pushes only branches pointing to the @
by default. Use
--all
to push all branches.
The checkouts
template keyword is now called working_copies
, and
current_checkout
is called current_working_copy
.
The new jj interdiff
command compares the changes in commits, ignoring
changes from intervening commits.
jj rebase
now accepts a --branch/-b <revision>
argument, which can be used
instead of -r
or -s
to specify which commits to rebase. It will rebase the
whole branch, relative to the destination. The default mode has changed from
-r @
to -b @
.
The new jj print
command prints the contents of a file in a revision.
The new jj git remotes list
command lists the configured remotes and their
URLs.
#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
mode). For example, use jj move --to @-- foo
to move the changes to file
(or directory) foo
in the working copy to the grandparent commit.
When jj move/squash/unsquash
abandons the source commit because it became
empty and both the source and the destination commits have non-empty
descriptions, it now asks for a combined description. If either description
was empty, it uses the other without asking.
jj split
now lets you specify on the CLI which paths to include in the first
commit. The interactive diff-editing is not started when you do that.
Sparse checkouts are now supported. In fact, all working copies are now
"sparse", only to different degrees. Use the jj sparse
command to manage
the paths included in the sparse checkout.
Configuration is now also read from ~/.jjconfig.toml
.
The $JJ_CONFIG
environment variable can now point to a directory. If it
does, all files in the directory will be read, in alphabetical order.
The $VISUAL
environment is now respected and overrides $EDITOR
. The new
ui.editor
config has higher priority than both of them. There is also a new
$JJ_EDITOR
environment variable, which has even higher priority than the
config.
You can now use -
and +
in revset symbols. You used to have to quote
branch names like my-feature
in nested quotes (outer layer for your shell)
like jj co '"my-feature"'
. The quoting is no longer needed.
The new revset function connected(x)
is the same as x:x
.
The new revset function roots(x)
finds commits in the set that are not
descendants of other commits in the set.
ssh-agent is now detected even if $SSH_AGENT_PID
is not set (as long as
$SSH_AUTH_SOCK
is set). This should help at least macOS users where
ssh-agent is launched by default and only $SSH_AUTH_SOCK
is set.
When importing from a git, any commits that are no longer referenced on the
git side will now be abandoned on the jj side as well. That means that
jj git fetch
will now abandon unreferenced commits and rebase any local
changes you had on top.
jj git push
gained a --change <revision>
argument. When that's used, it
will create a branch named after the revision's change ID, so you don't have
to create a branch yourself. By default, the branch name will start with
push-
, but this can be overridden by the push.branch-prefix
config
setting.
jj git push
now aborts if you attempt to push a commit without a
description or with the placeholder "(no name/email configured)" values for
author/committer.
Diff editor command arguments can now be specified by config file.
Example:
[merge-tools.kdiff3]
program = "kdiff3"
edit-args = ["--merge", "--cs", "CreateBakFiles=0"]
jj branch
can accept any number of branches to update, rather than just one.
Aliases can now call other aliases.
jj log
now accepts a --reversed
option, which will show older commits
first.
jj log
now accepts file paths.
jj obslog
now accepts -p
/--patch
option, which will show the diff
compared to the previous version of the change.
The "(no name/email configured)" placeholder value for name/email will now be
replaced if once you modify a commit after having configured your name/email.
Color setting can now be overridden by --color=always|never|auto
option.
jj checkout
now lets you specify a description with --message/-m
.
jj new
can now be used for creating merge commits. If you pass more than
one argument to it, the new commit will have all of them as parents.
When rebasing a conflict where one side modified a file and the other side
deleted it, we no longer automatically resolve it in favor of the modified
content (this was a regression from commit c0ae4b16e8c4).
Errors are now printed to stderr (they used to be printed to stdout).
Updating the working copy to a commit where a file's executable bit changed
but the contents was the same used to lead to a crash. That has now been
fixed.
If one side of a merge modified a directory and the other side deleted it, it
used to be considered a conflict. The same was true if both sides added a
directory with different files in. They are now merged as if the missing
directory had been empty.
When using jj move
to move part of a commit into an ancestor, any branches
pointing to the source commit used to be left on a hidden intermediate commit.
They are now correctly updated.
jj untrack
now requires at least one path (allowing no arguments was a UX
bug).
jj rebase
now requires at least one destination (allowing no arguments was a
UX bug).
jj restore --to <rev>
now restores from the working copy (it used to restore
from the working copy's parent).
You now get a proper error message instead of a crash when $EDITOR
doesn't
exist or exits with an error.
Global arguments, such as --at-op=<operation>
, can now be passed before
an alias.
Fixed relative path to the current directory in output to be .
instead of
empty string.
When adding a new workspace, the parent of the current workspace's current
checkout will be checked out. That was always the intent, but the root commit
was accidentally checked out instead.
When checking out a commit, the previous commit is no longer abandoned if it
has a non-empty description.
All commands now consistently snapshot the working copy (it was missing from
e.g. jj undo
and jj merge
before).
Published by martinvonz over 2 years ago
~/.jjconfig
. Your configuration is now read<config dir>/jj/config.toml
, where <config dir>
is${XDG_CONFIG_HOME}
or ~/.config/
on Linux,~/Library/Application Support/
on macOS, and ~\AppData\Roaming\
onYou can now set an environment variable called $JJ_CONFIG
to a path to a
config file. That will then be read instead of your regular config file. This
is mostly intended for testing and scripts.
The standard $NO_COLOR
environment variable is now
respected.
jj new
now lets you specify a description with --message/-m
.
When you check out a commit, the old commit no longer automatically gets
abandoned if it's empty and has descendants, it only gets abandoned if it's
empty and does not have descendants.
(#111) When undoing an earlier operation, any new commits on top of commits
from the undone operation will be rebased away. For example, let's say you
rebase commit A so it becomes a new commit A', and then you create commit B
on top of A'. If you now undo the rebase operation, commit B will be rebased
to be on top of A instead. The same logic is used if the repo was modified
by 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.
jj log
now accepts -p
/--patch
option.
Fixed crash on jj init --git-repo=.
(it almost always crashed).
When sharing the working copy with a Git repo, the automatic importing and
exporting (sometimes?) didn't happen on Windows.