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.11.0 #153098

Merged
merged 2 commits into from
Nov 1, 2023
Merged

jj 0.11.0 #153098

merged 2 commits into from
Nov 1, 2023

Conversation

p-linnane
Copy link
Member

Created by brew bump


Created with brew bump-formula-pr.

release notes
### Breaking changes
  • 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 local branch exists, the corresponding remote branches are considered
      tracking branches.
    • Otherwise, the remote branches are non-tracking branches.

    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.

New features

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

Fixed bugs

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

Contributors

Thanks to the people who made this release happen!

  • Antoine Cezar (@AntoineCezar)
  • Austin Seipp (@thoughtpolice)
  • Benjamin Saunders (@Ralith)
  • Gabriel Scherer (@gasche)
  • Ilya Grigoriev (@ilyagr)
  • Infra (@1011X)
  • Isabella Basso (@isinyaaa)
  • Martin von Zweigbergk (@martinvonz)
  • Tal Pressman (@talpr)
  • Waleed Khan (@arxanas)
  • 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 1, 2023
Copy link
Contributor

github-actions bot commented Nov 1, 2023

🤖 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 1, 2023
@BrewTestBot BrewTestBot enabled auto-merge November 1, 2023 22:46
@BrewTestBot BrewTestBot added this pull request to the merge queue Nov 1, 2023
Merged via the queue into Homebrew:master with commit e3c9890 Nov 1, 2023
12 checks passed
@p-linnane p-linnane deleted the bump-jj-0.11.0 branch November 1, 2023 22:55
@github-actions github-actions bot added the outdated PR was locked due to age label Dec 2, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. outdated PR was locked due to age 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