jj icon indicating copy to clipboard operation
jj copied to clipboard

Published 20 hours ago • verified publisher icon jj-vcs

[POC] Generations for change numbers

Open scott2000 opened this issue 3 months ago • 1 comments
trafficstars

Resolves #7028. This is currently just a proof of concept in case anyone wants to try it out and see how it feels (it's available as scott2000/change-generation in the jj repo).

Checklist

If applicable:

  • [ ] I have updated CHANGELOG.md
  • [ ] I have updated the documentation (README.md, docs/, demos/)
  • [ ] I have updated the config schema (cli/src/config-schema.json)
  • [ ] I have added/updated tests to cover my changes

scott2000 avatar Aug 07 '25 00:08 scott2000

I've been using it for two days, and it worked very well so far :+1:

glehmann avatar Sep 15 '25 14:09 glehmann

I updated this PR to use the / separator instead of ?. This also makes the implementation significantly simpler. Since /0 no longer is visually similar to the old ?? divergent marker, I also moved "divergent" to be a label at the end, similar to conflicts.

Screenshots

Log with divergent:

image

Evolog with hidden commits:

image

Evolog with hidden and divergent:

image

Edit: I updated the generation number to be calculated ignoring visible/hidden state as suggested in https://github.com/jj-vcs/jj/pull/7194#discussion_r2548952508

scott2000 avatar Nov 20 '25 02:11 scott2000