Jujutsu mode for Emacs

jj-mode provides a magit-inspired interface for Jujutsu, offering an efficient way to interact with JJ repositories from within Emacs.

Features

• Magit-style log viewer with collapsible sections and syntax highlighting
• Interactive rebase with visual source/destination selection via transients
• Bookmark management with create, abandon, forget, track, and tug operations
• Commit and describe with dedicated message buffers and window management
• Diff viewing with file and hunk-level navigation
• Context-sensitive actions via DWIM (Do What I Mean) Enter key behavior
• Git integration with push/fetch operations and configurable options
• Built-in conflict resolution using Emacs ediff and smerge-mode

Requirements

• Emacs 26.1 or later
• Jujutsu (jj) installed and in PATH
• magit (for section management and UI components)
• transient (usually bundled with magit)

Installation

Doom Emacs

(package! jj-mode :recipe (:host github :repo "bolivier/jj-mode.el"))

use-package with straight.el

(use-package jj-mode
  :straight (:host github :repo "bolivier/jj-mode.el"))

use-package with built-in package-vc integration

(use-package jj-mode
  :vc (:url "https://github.com/bolivier/jj-mode.el"))

Manual

Clone this repository and add it to your load path:

(add-to-list 'load-path "/path/to/jj-mode")
(require 'jj-mode)

Evil Mode

jj-mode doesn't ship with support for evil mode by default. To make it work you need to put this snippet in your init config

(evil-make-overriding-map jj-mode-map 'normal)
 

Or, in Doom Emacs

(after! jj-mode
  (evil-make-overriding-map jj-mode-map 'normal))

Usage

Start with M-x jj-log to open the main interface. Each project gets its own buffer (*jj-log:project-name*).

Key Bindings

Navigation

• n/p - Navigate between sections
• RET - Context-sensitive action (edit changeset, jump to file/line in diffs)
• . - Jump to current changeset (@)
• TAB - Toggle section folding

Basic Operations

• g - Refresh log
• c - Commit (opens message buffer)
• d - Describe changeset at point (opens message buffer)
• e - Edit changeset (jj edit)
• u - Undo last operation
• s - Squash
• N - New changeset here
  • n create new changeset with options
  • a create new changeset after bookmark with options
  • b create new changeset before bookmark with options

Advanced Operations

• r - Rebase transient menu
  • s - Set rebase source
  • d - Toggle rebase destination
  • r - Execute rebase
  • c - Clear selections
• b - Bookmark transient menu
  • c - Create bookmark
  • a - Abandon bookmark
  • f - Forget bookmark
  • t - Track remote bookmark
  • T - Tug (jj tug)
• G - Git operations transient
  • -n - Toggle --allow-new flag
  • -b - Set bookmark to push
  • p - Push
  • f - Fetch

Conflict Resolution

• E - Edit conflicts with ediff
• M - Edit conflicts with smerge-mode

Message Buffers

When editing commit/describe messages:

• C-c C-c - Finish and execute
• C-c C-k - Cancel

Workflow Example

1. M-x jj-log - Open JJ interface
2. Navigate to desired changeset with j/k
3. c - Commit current changes
4. Edit message, C-c C-c to finish
5. r - Open rebase menu, select source with s, destinations with d, execute with r
6. b - Manage bookmarks as needed
7. G p - Push to remote

Configuration

;; Customize jj executable path if needed
(setq jj-executable "/path/to/jj")

Contributing

Issues and pull requests welcome! This project aims to provide a solid JJ interface while maintaining magit-like usability patterns.