Repository navigation
feat(vcs): work in jj repositories - #28
Merged
Merged
Conversation
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
laneway now reads branches, checkouts, commits and time from jj where a repo has a
.jj(colocated or not).@or an ancestor that isn't trunk's. Bookmarks below the point where@leaves trunk are merged history and don't count.<repo>.<branch-slug>) and opens it in herdr. Withui.multiplexer.jj_workspaces: truethe multiplexer makes it instead (drover). Removing a worktree forgets the workspace.hook installrefuses in a jj repo and the newlaneway hook check [-fix] [-strict]checks the branch's changes for issue keys before a push.internal/vcs.Tests:
internal/vcscovers 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.