Repository navigation
v0.47.0 #10586
josephlou5
started this conversation in
General
v0.47.0
#10586
Replies: 1 comment 2 replies
|
Thanks for the release! FYI I am hitting rust-lang/stacker#155 on the musl build (according to a preliminary AI investigation) Trace |
2 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
About
jj is a Git-compatible version control system that is both simple and powerful.
See the installation instructions to get started.
Release highlights
Templates now have a top-level
revset(revset: Stringify) -> List<Commit>function for evaluating revsets during templating.
In colocated workspaces,
jj describe -r@,jj restore --into=@, etc. nolonger reset the staging area, just as snapshotting doesn't.
jj new @-stillresets it.
Breaking changes
In non-colocated workspaces,
jj git fetchandpushno longer updateremote-tracking Git refs. Use
jj git exportto export remote bookmarks toGit.
In non-colocated workspaces,
jj git import; jj undo; jj git importno longerre-imports external changes. Run
jj git exportto reflect undone changes inGit.
jj git fetch; jj undo; jj git fetchcontinues to work as expected.Timestamp.format()now follows jiff's strftimesyntax instead of
chrono's. Most directives, including the default format, are unchanged, but:
%vand%+are no longer supported. Use%e-%b-%Yand%Y-%m-%dT%H:%M:%S%.3f%:z(which always includes milliseconds) instead.%c,%x, and%rproduce different output. For example,%xnowformats as
2001 M07 8rather than07/08/01.%fnow prints only as many digits as needed rather than always 9. Use%9for%Nfor the old behavior. Similarly,%.fno longer pads to 3, 6,or 9 digits, so it formats as
.12rather than.120.%Znow prints a time zone abbreviation. Use%:zto get an offset.%:::znow includes the minutes of an offset when they are non-zero.%N,%Q,%^a, and%5Yare nowaccepted.
%#zno longer panics.json(timestamp)now prints a UTC time zone offset as+00:00instead ofZ.The bookmarks and tags list now include absent targets for conflicted
bookmarks and tags. The
.removed_targets()and.added_targets()templatemethods now return
List<Option<Commit>>.New features
jj git pushwithgit.sign-on-pushenabled now signs commits in aseparate operation before the push, so commits stay signed if the push
fails and a new push doesn't have to sign them again.
Diff hunk headers now include symbol context even for unsupported languages.
jj resolvegained a built-in:editormerge tool that opens the conflictedfile with conflict markers in your text editor. Unlike the other merge tools,
it supports conflicts with more than two sides.
jj config gcnow also cleans up workspace configs whose paths no longerexist.
Commit.contained_in()now accepts aStringifyinstead of aStringLiteral.This enables dynamic query building during templating.
Templates now have a top-level
revset(revset: Stringify) -> List<Commit>function for evaluating revsets during templating.
The
TreeEntrytemplate type now has.removed_values() -> List<Option<TreeValue>>and
.added_values() -> List<Option<TreeValue>>methods, andTreeValuenowexposes
.object_id(),.file_type(), and.executable()methods forinspecting each side of a (possibly conflicted) tree entry.
The
WorkspaceReftemplate type now has a.current_workspace() -> Booleanmethod, which can be used to identify the current workspace. This is slightly
different than
self.target().current_working_copy()because multipleworkspaces can point to the same commit.
jj next/jj prevnow accept a change ID prefix when prompting for thetarget commit. The special
qquit choice was removed; cancel with EOF.#9790
jj convergenow accepts a change ID prefix when prompting for the changeto converge. The special
qabort choice was removed; canceling with EOF nowexits with an error (previously
qaborted successfully).jj file searchnow detects binary files (any null byte in the first 8000bytes) and emits
Binary file matches: <path>instead of dumping raw bytes tostdout. Use
--binary-as-textto force text treatment, or--skip-binarytoskip binary files entirely.
Fixed bugs
jj git pushno longer validates (e.g. for empty descriptions) commits thatare already on the remote as a tag.
jj git fetchno longer creates additional refs based on non-standard Gitremote.<name>.fetchconfiguration.jj gerrit uploadno longer rejects uploading empty merge commits.The operations created by
jj workspace addare now attributed to theworkspace the command was run in, so
jj undothere undoes them instead ofrefusing to undo an operation from another workspace.
jj workspace add -rwith an invalid revision no longer leaves ahalf-created workspace behind.
Shell completion now suggests tag names for
jj tag track,jj tag untrack,jj tag list,jj git fetch --tag, andjj git push --tag.Fixed tag deletion with
jj git fetch --tag=NAME.jj workspace removecan now remove stale workspaces.#10276
Fixed issue with
config-schema.jsonwhere Taplo (TOML parsing library) wouldflag any
aliasesdefined as a table but without an explicit.enabled = trueas "valid under more than one of the schemas". This affecteddownstream tools such as editor extensions showing errors in perfectly valid
config files.
Fixed a race condition in colocated workspaces where concurrent
jj git fetchand
jjcommands could import partially fetched refs, causing divergence.#7349
Fixed a race condition in colocated workspaces where changes to the Git index
made by a concurrent Git process could get lost.
In colocated workspaces, Git export failures are no longer misidentified as
external changes. Those changes are now re-exported on the next
jjinvocation. #10478
In colocated workspaces,
jj describe -r@,jj restore --into=@, etc. nolonger reset the staging area, just as snapshotting doesn't.
jj new @-stillresets it.
jj runnow materializes conflicts usingui.conflict-marker-styleinsteadof always using the
snapshotstyle.#10390
The Git backend now leaves out the root commit as a parent of a merge commit
instead of failing. This fixes abandoning a child of the root commit that is a
parent of a merge commit, including when a Git import abandons it.
#8076
On Unix, repository files under
.jjare now created with default filepermissions.
Racy
jj config setinvocations no longer corrupt the target file. The lastsave wins; changes from other concurrent invocations may be lost.
#10350
Date patterns such as
after:"2024-03-10 03:30"are now resolved with thecorrect UTC offset on days with a daylight savings transition. Previously,
the offset from the start of the day was used, so times after were off
by an hour. Likely a niche bug fix, but a bug fix nonetheless!
Deeply nested revset, fileset, and template expressions are now rejected
instead of causing a crash.
#10071
In graph output, an elided edge that passes through a merge or fork line is
now drawn as elided (
╷) before reaching the node, instead of looking like adirect edge. Consecutive unconnected nodes, such as in the
jj op showgraph, are now separated by a blank line so they don't look connected.
jj logno longer draws a commit as a merge with two elided edges to thesame commit when there's a merge between them whose parents both lead to
that commit.
The "Did you mean" hint for a mistyped bookmark, revision, or function no
longer lists every similar name. It now shows the 5 most similar ones,
most similar first, followed by e.g.
or 20 others.#8017
Contributors
Thanks to the people who made this release happen!
This discussion was created from the release v0.47.0.
All reactions