Skip to content

feat(vcs): work in jj repositories - #28

Merged
cornedor merged 2 commits into
mainfrom
jj-support
Nov 19, 2026
Merged

cornedor merged 2 commits into
mainfrom
jj-support

Conversation

@cornedor

Copy link
Copy Markdown
Owner

laneway now reads branches, checkouts, commits and time from jj where a repo has a .jj (colocated or not).

  • Branch: the nearest bookmark on @ or an ancestor that isn't trunk's. Bookmarks below the point where @ leaves trunk are merged history and don't count.
  • Start work: makes a jj workspace next to the repo (<repo>.<branch-slug>) and opens it in herdr. With ui.multiplexer.jj_workspaces: true the multiplexer makes it instead (drover). Removing a worktree forgets the workspace.
  • Time proposals: jj commits plus evolog snapshots, keyed by the change's bookmark.
  • Hooks: jj runs no git hooks, so hook install refuses in a jj repo and the new laneway hook check [-fix] [-strict] checks the branch's changes for issue keys before a push.
  • Git repos behave as before; the git calls moved into internal/vcs.

Tests: internal/vcs covers workspaces, kept/unmerged, snapshots, push/fetch and the merged-bookmark case against a real jj repo; web, work and hook tests cover the jj flows. CI installs jj 0.46 on Linux; jj tests skip where jj is missing (macOS CI).

Not verified: the CI jj download step (not run locally) and the docs build.

Read branches, checkouts, commits and time from jj where a repo has a .jj:
bookmarks are branches, workspaces worktrees. Start work makes a jj workspace
itself unless multiplexer.jj_workspaces says the multiplexer does (drover).
jj runs no git hooks, so laneway hook check does commit-msg's work.
Comment thread internal/vcs/vcs.go Fixed
@cornedor
cornedor merged commit 74e3211 into main Nov 19, 2026
9 checks passed
@cornedor
cornedor deleted the jj-support branch November 19, 2026 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants