v0.15.0

[martinvonz]

Breaking changes

• The minimum supported Rust version (MSRV) is now 1.76.0.

• The on-disk index format changed. New index files will be created
  automatically, but it can fail if the repository is co-located and predates
  Git GC issues #815. If
  reindexing failed, you'll need to clean up corrupted operation history by
  jj op abandon ..<bad operation ID>.

• Dropped support for the "legacy" graph-drawing style. Use "ascii" for a very
  similar result.

• The default log output no longer lists all tagged heads. Set revsets.log = "@ | ancestors(immutable_heads().., 2) | heads(immutable_heads())" to restore
  the old behavior.

• Dropped support for the deprecated : revset operator. Use :: instead.

• jj rebase --skip-empty no longer abandons commits that were already empty
  before the rebase.

New features

• Added support for commit signing and verification. This comes with
  out-of-the-box support for the following backends:

  • GnuPG
  • SSH

• Templates now support logical operators: ||, &&, !

• Templates now support the self keyword, which is the current commit in jj log/obslog templates.

• jj show now accepts -T/--template option to render its output using
  template

• jj config list now accepts -T/--template option.

• jj git fetch now accepts -b as a shorthand for --branch, making it more
  consistent with other commands that accept a branch

• In the templating language, Timestamps now have a .local() method for
  converting to the local timezone.

• jj next/prev now infer --edit when you're already editing a non-head
  commit (a commit with children).

• A new built-in pager named :builtin is available on all platforms,
  implemented with minus

• Set config ui.log-synthetic-elided-nodes = true to make jj log include
  synthetic nodes in the graph where some revisions were elided
  (#1252,
  #2971). This may become the
  default depending on feedback.

• When creating a new workspace, the sparse patterns are now copied over from
  the current workspace.

• jj git init --colocate can now import an existing Git repository. This is
  equivalent to jj git init --git-repo=..

• jj git fetch now automatically prints new remote branches and tags by default.

• --verbose/-v is now --debug (no short option since it's not intended to be used often)

• jj move --from/--to can now be abbreviated to jj move -f/-t

• jj commit/diffedit/move/resolve/split/squash/unsquash now accept
  --tool=<NAME> option to override the default.
  #2575

• Added completions for Nushell to jj util completion

• jj branch list now supports a --tracked/-t option which can be used to
  show tracked branches only. Omits local Git-tracking branches by default.

• Commands producing diffs now accept a --context flag for the number of
  lines of context to show.

• jj commands with the -T/--template option now provide a hint containing
  defined template names when no argument is given, assisting the user in making
  a selection.

Fixed bugs

• On Windows, symlinks in the repo are now supported when Developer Mode is enabled.
  When symlink support is unavailable, they will be materialized as regular files in the
  working copy (instead of resulting in a crash).
  #2

• On Windows, the :builtin pager is now used by default, rather than being
  disabled entirely.

• Auto-rebase now preserves the shape of history even for merge commits where
  one parent is an ancestor of another.
  #2600

Contributors

Thanks to the people who made this release happen!

• Aleksey Kuznetsov (@zummenix)
• Anton Bulakh (@necauqua)
• Anton Älgmyr (@algmyr)
• Austin Seipp (@thoughtpolice)
• Benjamin Brittain (@benbrittain)
• Benjamin Tan (@bnjmnt4n)
• Daehyeok Mun (@daehyeok)
• Daniel Ploch (@torquestomp)
• Evan Mesterhazy (@emesterhazy)
• gulbanana (@gulbanana)
• Ilya Grigoriev (@ilyagr)
• Jonathan Tan (@jonathantanmy)
• Julien Vincent (@julienvincent)
• jyn (@jyn514)
• Martin von Zweigbergk (@martinvonz)
• Paulo Coelho (@prscoelho)
• Philip Metzger (@PhilipMetzger)
• Poliorcetics (@poliorcetics)
• Stephen Jennings (@jennings)
• Vladimir (@0xdeafbeef)
• Yuya Nishihara (@yuja)

---

This discussion was created from the release v0.15.0.

[necauqua]

Oof, the signing is in (but also without the sign command?. don't remember fully atm), but we haven't merged the verification bit in, and the changelog entry is from when it was a single PR I think 🙃

[martinvonz]

Both the text above and the text in the CHANGELOG.md can be changed. What should I change it to?

[necauqua]

Something similar to that maybe?. Only half of the signing stuff made it into the release :)

Partial support for commit signing.
Currently you can configure jj to "keep" commit signatures by making new ones for rewritten commits,
and to sign new commits when they are created.

Signature verification and an explicit sign command will land in 0.16.

This comes with out-of-the-box support for the following backends:
- GnuPG
- SSH

[julienvincent]

I think I would avoid stating the rest will land in a prticular upcoming version, but the rest looks good to me.

P.s: Sorry for missing this!

[amiryal]

• Set config ui.log-synthetic-elided-nodes = true to make jj log include
  synthetic nodes in the graph where some revisions were elided
  (#1252,
  #2971). This may become the
  default depending on feedback.

I love it! Some feedback:

The current choice of Unicode character (DOTTED CIRCLE) renders as double the width when followed by a space in my terminal (Kitty on Ubuntu Jammy 22.04):

Therefore, I am in support of such exploration as #3124. It is worth noting that it’s not an issue on another workstation running Kitty on Ubuntu Mantic 23.10.

I would also do away with the wording (elided revisions). Simply spacing the graph where elided commits are present would be better, in my taste. I.e. compared to this:

$ jj log -r 'z|heads(::)'
@  wzkrkuur (no email set) 2024-03-08 11:32:28.000 +02:00 b6b41359
│  (empty) (no description set)
◌  (elided revisions)
│ ◉  tpstlust [email protected] 2018-05-10 12:55:19.000 -05:00 octocat-patch-1@origin b1b3f972
│ │  sentence case
│ ◌  (elided revisions)
├─╯
│ ◉  kowxouwz [email protected] 2014-06-10 15:22:26.000 -07:00 test@origin b3cbd5bb
│ │  Create CONTRIBUTING.md
│ ◌  (elided revisions)
├─╯
◉  zzzzzzzz root() 00000000

I would prefer this (cleaner and less noisy, illustrated here with VERTICAL FOUR DOTS instead of DOTTED CIRCLE):

$ jj log -r 'z|heads(::)'
@  wzkrkuur (no email set) 2024-03-08 11:32:28.000 +02:00 b6b41359
│  (empty) (no description set)
⁞
│ ◉  tpstlust [email protected] 2018-05-10 12:55:19.000 -05:00 octocat-patch-1@origin b1b3f972
│ │  sentence case
│ ⁞
├─╯
│ ◉  kowxouwz [email protected] 2014-06-10 15:22:26.000 -07:00 test@origin b3cbd5bb
│ │  Create CONTRIBUTING.md
│ ⁞
├─╯
◉  zzzzzzzz root() 00000000

The effect is much more pronounced when the template renders only one line per commit.

[benbrittain]

I have mixed feelings on that statement. For example, I use jj at work and while I'm able to control binaries installed on my VM/dev box/etc, I don't have control over the terminal emulator on my laptop. I don't think that's an uncommon situation

[martinvonz]

Maybe it's fine after #3263 has landed?

[thoughtpolice]

Well, it's "you need a non-buggy emulator if you want elided nodes." With #3263, realistically speaking — if you can't find any elided node that works well due to your terminal, then my suggestion would be to just turn off elided nodes... There's nothing we can really do at that point.

[martinvonz]

There's always = as fallback :) It actually looks pretty okay as a harpoon substitute.

[benbrittain]

I think this is fine, especially if #3263 lands. I just want to express caution about assuming everyone has an easy time upgrading their software around jj.