Jujutsu support?

[tomasd]

Hi! I use jujutsu (https://github.com/jj-vcs/jj) for most of my repos and would love tuios to understand it alongside git. Is that something you’re planning? If not, would you accept a PR adding it?

[Gaurav-Gosain]

Hi @tomasd, thanks for asking! It isn't planned on my side right now, but I'd be happy to take a PR. Here's where things stand so you know what you'd be getting into.

In a colocated repo a fair bit already works, because those parts only look at files on disk: the review overlay and checkpoints diff your working files through git, so they don't care that jj made the changes. The rail is where it shows: jj keeps git's HEAD detached, so you'll see a short hash instead of your bookmark. A non-colocated repo shows nothing, since tuios looks for .git.

Proper support touches three places:

• internal/gitstate, for the rail: read the bookmark or change id. It reads git's files directly today, so it costs nothing, while jj would need a jj log call. I'd want that cached so the rail stays light.
• internal/worktree, which is the one package that runs git: worktrees, fan and ship would use jj workspace add and jj git push when the folder is a jj repo.
• internal/review, which mostly works already in a colocated repo.

If you'd like to take it on, I'd start with the rail alone: detect .jj and show the bookmark. It's small, useful by itself, and sets up the seam for the rest. Open an issue with a short plan first and I'll help shape it.

[tomasd]

Thanks @Gaurav-Gosain ! I opened #1444 with a short plan: four small PRs, the rail first, as you suggested. It has two questions at the end: whether non-colocated workspaces are fine from the start, and whether the risk marks are wanted.

A first version of all four is on my fork (tomasd/tuios, branches jj/rail, jj/review, jj/worktree, jj/risk), rebased on main and with e2e tests. I'll open the rail PR when you've had a look at the plan.

[Gaurav-Gosain]

Quick update for anyone who lands here: jj support is happening, thanks to @tomasd! The
rail (#1470) and review (#1579) parts are in, worktree sessions and ship are up for
review in #1688, and the risk marks come last. #1444 tracks the whole plan, so follow
along there.

[Gaurav-Gosain]

Closing this in favour of #1444, which is where the jj work lives now. Thanks to @tomasd, the rail and review parts ship in v0.13.0: the rail shows your bookmark in a jj workspace, colocated or not, and tuios review reviews the stack from trunk(). Worktree sessions and ship are in #1688, and the risk rules for jj commands come last. Follow #1444 for the rest!