Integration with Jujutsu

[yoav-lavi]

Jujutsu (or jj) is a git compatible distributed version control system (DVCS). When working in a repository managed by Jujutsu, Helix will not display any gutter change indicators, as that functionality currently works with a standard git repository.

Support may be relatively simple, see https://github.com/martinvonz/jj/blob/main/docs/github.md#using-github-cli (using .jj/repo/store/git)

[archseer]

Jujutsu is git compatible so it should be fine to simply rely on git functionality.

[yoav-lavi]

@archseer as far as I can tell it doesn't work out of the box, do you mean using the same mechanism but changing the detection of git repositories?

[archseer]

I just ran jj init --git-repo=. on my existing repository. jj is tracking changes in my working copy just fine. If I check git status those changes are still unstaged and helix displays a diff.

[yoav-lavi]

@archseer that's a co-located jj repo, they retain the .git folder AFAIK. If you jj git clone ... or use something other than =. the .git isn't there and no changes are displayed as far as I can tell

[archseer]

For compatibility I'd recommend using a clone that contains the .git folder. We're unlikely to add any other VCS any time soon (we don't even support Mercurial or Pijul so Jujutsu would be an even harder sell right now)

[yoav-lavi]

https://github.com/martinvonz/jj/blob/main/docs/git-compatibility.md#co-located-jujutsugit-repos

[archseer]

It's also useful when tools (e.g. build tools) expect a Git repo to be present.

[yoav-lavi]

To clarify I saw this with jj git clone specifically

[yoav-lavi]

@archseer sure, this isn't a bug, it's an enhancement suggestion (full jj support without co-locating)

[archseer]

Hmm since jj does use a proper git store (.jj/repo/store/git) it might be possible it could work by modifying the search path but I'm not sure if working changes would be detected properly.

\cc @pascalkuthe

[yoav-lavi]

For compatibility I'd recommend using a clone that contains the .git folder. We're unlikely to add any other VCS any time soon (we don't even support Mercurial or Pijul so Jujutsu would be an even harder sell right now)

@archseer Sorry, I'm on mobile and missed this!

I'm suggesting this since as you said it uses a proper git store, but I'd 100% completely understand if this isn't one of Helix's goals. Suggested specifically since I thought it might be a relatively painless and useful addition.

[yoav-lavi]

@archseer I may also be able to look into contributing this if it's something a newcomer to the codebase would be able to add / makes sense with the way it's currently implemented

[pascalkuthe]

We use gitoxide for repo discovery so the way to make this work in helix is to contribute that upstream. Altough we also use .git for workspace root discovery so having a .git folder present is likely a good idea anyway