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.24.0 #200099

Merged
merged 2 commits into from
Dec 4, 2024
Merged

jj 0.24.0 #200099

merged 2 commits into from
Dec 4, 2024

Conversation

BrewTestBot
Copy link
Member

Created by brew bump


Created with brew bump-formula-pr.

release notes
### 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 != logical operators for Boolean,
    Integer, and String types.

  • New command jj absorb that moves changes to stack of mutable revisions.

  • New command jj util exec that can be used for arbitrary aliases.

  • jj rebase -b can now be used with the --insert-after and --insert-before
    options, like jj rebase -r and jj rebase -s.

  • A preview of improved shell completions was added. Please refer to the
    documentation
    to activate them. They additionally complete context-dependent, dynamic values
    like bookmarks, aliases, revisions, operations and files.

  • Added the config setting snapshot.auto-update-stale for automatically
    running jj workspace update-stale when applicable.

  • jj duplicate now accepts --destination, --insert-after and
    --insert-before options to customize the location of the duplicated
    revisions.

  • jj log now displays the working-copy branch first.

  • New fork_point() revset function can be used to obtain the fork point
    of multiple commits.

  • The tags() revset function now takes an optional pattern argument,
    mirroring that of bookmarks().

  • Several commands now support -f/-t shorthands for --from/--to:

    • diff
    • diffedit
    • interdiff
    • op diff
    • restore
  • New ui.conflict-marker-style config option to change how conflicts are
    materialized in the working copy. The default option ("diff") renders
    conflicts as a snapshot with a list of diffs to apply to the snapshot.
    The new "snapshot" option renders conflicts as a series of snapshots, showing
    each side and base of the conflict. The new "git" option replicates Git's
    "diff3" conflict style, meaning it is more likely to work with external tools,
    but it doesn't support conflicts with more than 2 sides.

  • New merge-tools.<TOOL>.conflict-marker-style config option to override the
    conflict marker style used for a specific merge tool.

  • New merge-tools.<TOOL>.merge-conflict-exit-codes config option to allow a
    merge tool to exit with a non-zero code to indicate that not all conflicts
    were resolved.

  • jj simplify-parents now supports configuring the default revset when no
    --source or --revisions arguments are provided with the
    revsets.simplify-parents config.

Fixed bugs

  • jj config unset <TABLE-NAME> no longer removes a table (such as [ui].)

Contributors

Thanks to the people who made this release happen!

  • Austin Seipp (@thoughtpolice)
  • Benjamin Tan (@bnjmnt4n)
  • Daniel Ploch (@torquestomp)
  • Emily (@neongreen)
  • Essien Ita Essien (@essiene)
  • Herman J. Radtke III (@hjr3)
  • Ilya Grigoriev (@ilyagr)
  • Joaquín Triñanes (@JoaquinTrinanes)
  • Lars Francke (@lfrancke)
  • Luke Randall (@lukerandall)
  • Martin von Zweigbergk (@martinvonz)
  • Nathanael Huffman (@nathanaelhuffman)
  • Philip Metzger (@PhilipMetzger)
  • Remo Senekowitsch (@senekor)
  • Robin Stocker (@robinst)
  • Scott Taylor (@scott2000)
  • Shane Sveller (@shanesveller)
  • Tim Janik (@tim-janik)
  • 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 Dec 4, 2024
@junglerobba
Copy link
Contributor

Is there any interest in enabling the new dynamic shell completions introduced in this release?
https://martinvonz.github.io/jj/latest/install-and-setup/#command-line-completion
Or should that be left up to the users until upstream makes them the default?

Copy link
Contributor

github-actions bot commented Dec 4, 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 Dec 4, 2024
@BrewTestBot BrewTestBot enabled auto-merge December 4, 2024 23:31
@BrewTestBot BrewTestBot added this pull request to the merge queue Dec 4, 2024
Merged via the queue into master with commit 4a6748b Dec 4, 2024
15 checks passed
@BrewTestBot BrewTestBot deleted the bump-jj-0.24.0 branch December 4, 2024 23:37
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.

3 participants