Jujutsu

Breaking changes

• jj move has been removed. It was deprecated in 0.16.0.

• jj checkout and the built-in alias jj co have been removed.
  It was deprecated in 0.14.0.

• jj merge has been removed. It was deprecated in 0.14.0.

• jj git push no longer pushes new bookmarks by default. Use --allow-new to
  bypass this restriction.

• Lines prefixed with "JJ:" in commit descriptions and in sparse patterns (from
  jj sparse edit) are now stripped even if they are not immediately followed
  by a space. #5004

Deprecations

New features

• Templates now support the == and != l

Security fixes

• Fixed path traversal by cloning/checking out crafted Git repository containing
  .., .jj, .git paths. (GHSA-88h5-6w7m-5w56; CVE-2024-51990)

Breaking changes

• Revset function names can no longer start with a number.

• Evaluation error of revsets.short-prefixes configuration is now reported.

• The HEAD@git symbol no longer resolves to the Git HEAD revision. Use
  git_head() or @- revset expression instead. The git_head template
  keyword now returns a boolean.

• Help command doesn't work recursively anymore, i.e. jj workspace help root
  doesn't work anymore.

• The color label

Breaking changes

• Fixing #4239 means the
  ordering of some messages have changed.

• Invalid ui.graph.style configuration is now an error.

• The builtin template branch_list has been renamed to bookmark_list as part
  of the jj branch deprecation.

Deprecations

• jj branch has been deprecated in favor of jj bookmark.

  Rationale: Jujutsu's branches don't behave like Git branches, which a
  confused many newcomers, as they expected a similar behavior given the name.
  We've renamed them to "bookmarks" to match the actual behavior, as we think
  that describes them better, and they also behave similar to Mercurial's
  bookmarks.

Breaking changes

• next/prev will no longer infer when to go into edit mode when moving from
  commit to commit. It now either follows the flags --edit|--no-edit or it
  gets the mode from ui.movement.edit.

Deprecations

• jj untrack has been renamed to jj file untrack.

New features

• Add new boolean config knob, ui.movement.edit for controlling the behaviour
  of prev/next. The flag turns edit mode on and off permanently when set
  respectively to true or false.

• All diff formats except --name-only now include information about copies and
  moves. So do exter

Note to packagers

• jj now links libgit2 statically by default. To use dynamic linking, you
  need to set the environment variable LIBGIT2_NO_VENDOR=1 while compiling.
  (#4163)

Breaking changes

• jj rebase --skip-empty has been renamed to jj rebase --skip-emptied

• jj backout --revision has been renamed to jj backout --revisions.
  The short alias -r is still supported.

• The default immutable_heads() set
  now includes untracked_remote_branches() with the assumption that untracked
  branches aren't managed by you. Therefore, untracked branches are no longer
  displayed in jj log by

Breaking changes

• 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

Deprecations

• Replacing

Breaking changes

• 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

Fixed bugs

• jj status no longer scans through the entire history to look for ancestors with conflicts.

Breaking changes

• 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.

New features

• The list of conflicted paths is printed whenever the working copy changes.
  This can be

Deprecations

• jj move was deprecated in favor of jj 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 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.

New features

• Config now supports rgb hex colors (in the form #rrggbb) wherever existing color names are supported.

No code changes (fixing Rust Cargo.toml stuff).