Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jj 0.23.0 #196944

Merged
merged 2 commits into from
Nov 7, 2024
Merged

jj 0.23.0 #196944

merged 2 commits into from
Nov 7, 2024

Conversation

BrewTestBot
Copy link
Member

Created by brew bump


Created with brew bump-formula-pr.

release notes
### 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 op_log from the [colors] config section now only
    applies to the op log and not to the other places operations are displayed. In
    almost all cases, if you configured op_log before, you should use the new
    operation label instead.

  • Default operation log template now shows end times of operations instead of
    start times.

Deprecations

  • git.auto-local-bookmark replaces git.auto-local-branch. The latter remains
    supported for now (at lower precedence than the former).

New features

  • Added diff options to ignore whitespace when comparing lines. Whitespace
    changes are still highlighted.

  • New command jj simplify-parents will remove redundant parent edges.

  • jj squash now supports -f/-t shorthands for --from/--[in]to.

  • Initial support for shallow Git repositories has been implemented. However,
    deepening the history of a shallow repository is not yet supported.

  • jj git clone now accepts a --depth <DEPTH> option, which
    allows to clone the repository with a given depth.

  • New command jj file annotate that annotates files line by line. This is similar
    in functionality to git blame. Invoke the command with jj file annotate <file_path>.
    The output can be customized via the templates.annotate_commit_summary
    config variable.

  • jj bookmark list gained a --remote REMOTE option to display bookmarks
    belonging to a remote. This option can be combined with --tracked or
    --conflicted.

  • New command jj config unset that unsets config values. For example,
    jj config unset --user user.name.

  • jj help now has the flag --keyword (shorthand -k), which can give help
    for some keywords (e.g. jj help -k revsets). To see a list of the available
    keywords you can do jj help --help.

  • New at_operation(op, expr) revset can be used in order to query revisions
    based on historical state.

  • String literals in filesets, revsets and templates now support hex bytes
    (with \e as escape / shorthand for \x1b).

  • New coalesce(revsets...) revset which returns commits in the first revset
    in the revsets list that does not evaluate to none().

  • New template function raw_escape_sequence(...) preserves escape sequences.

  • Timestamp objects in templates now have after(date) -> Boolean and
    before(date) -> Boolean methods for comparing timestamps to other dates.

  • New template functions pad_start(), pad_end(), truncate_start(), and
    truncate_end() are added.

  • Add a new template alias bultin_log_compact_full_description().

  • Added the config settings diff.color-words.context and diff.git.context to
    control the default number of lines of context shown.

Fixed bugs

  • Error on trunk() revset resolution is now handled gracefully.
    #4616

  • Updated the built-in diff editor scm-record to version
    0.4.0, which
    includes multiple fixes.

Contributors

Thanks to the people who made this release happen!

  • Alec Snyder (@allonsy)
  • Arthur Grillo (Grillo-0)
  • Austin Seipp (@thoughtpolice)
  • Benjamin Tan (@bnjmnt4n)
  • Dave Townsend (@Mossop)
  • Daniel Ploch (@torquestomp)
  • Emily (@neongreen)
  • Essien Ita Essien (@essiene)
  • Fedor Sheremetyev (@sheremetyev)
  • Ilya Grigoriev (@ilyagr)
  • Jakub Okoński (@farnoy)
  • Jcparkyn (@Jcparkyn)
  • Joaquín Triñanes (@JoaquinTrinanes)
  • Lukas Wirth (@Veykril)
  • Marco Neumann (@crepererum)
  • Martin von Zweigbergk (@martinvonz)
  • Matt Stark (@matts1)
  • Philip Metzger (@PhilipMetzger)
  • Philipp Albrecht (@pylbrecht)
  • Remo Senekowitsch (@senekor)
  • Richard Macklin (@rmacklin)
  • Robin Stocker (@robinst)
  • Samuel Tardieu (@samueltardieu)
  • Sora (@SoraTenshi)
  • Stephen Jennings (@jennings)
  • Theodore Ehrenborg (@TheodoreEhrenborg)
  • Vamsi Avula (@avamsi)
  • Vincent Ging Ho Yim (@cenviity)
  • Yuya Nishihara (@yuja)

@github-actions github-actions bot added rust Rust use is a significant feature of the PR or issue bump-formula-pr PR was created using `brew bump-formula-pr` labels Nov 7, 2024
Copy link
Contributor

github-actions bot commented Nov 7, 2024

🤖 An automated task has requested bottles to be published to this PR.

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Nov 7, 2024
@BrewTestBot BrewTestBot enabled auto-merge November 7, 2024 07:13
@BrewTestBot BrewTestBot added this pull request to the merge queue Nov 7, 2024
Merged via the queue into master with commit fea46fa Nov 7, 2024
15 checks passed
@BrewTestBot BrewTestBot deleted the bump-jj-0.23.0 branch November 7, 2024 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bump-formula-pr PR was created using `brew bump-formula-pr` CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. rust Rust use is a significant feature of the PR or issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants