Jujutsu X

A Visual Studio Code extension for the Jujutsu (jj) version control system. My personal development fork of Jujutsu Kaizen.

🚀 Features

The goal of this extension is to bring the great UX of Jujutsu into the VS Code UI.

Here's what you can do so far:

🔗 Graph view

• Compact graph view
  
  • Alternative: Extended graph view
• High information density
  • Minimal change IDs
  • No unnecessary information
  • No author name if it's your own change
• Elided commits
  
• Right-click on a change for a context menu, for example to abandon the change
• Select a change to see its affected files and diffs
• Create merge changes with shift-select
• Drag & drop changes onto other changes

✋ Drag & drop operations

• Rebase a change (with or without descendants) onto/after/before any other change
• Squash a change into any other change
• Duplicate a change onto/after/before any other change

📁 File management

• Track file statuses in the working copy
• Monitor file statuses across all parent changes
• View detailed file diffs for working copy and parent modifications
• Line-by-line blame annotations (optional)

💫 Change management

• Quickly commit with Ctrl+Enter
• Support both the squash workflow and the edit workflow
• Move changes between working copy and parents
  
• Move specific lines from the working copy to its parent changes
• Discard changes

⚠️ Conflicts

• Show conflicts in the graph and change view
  
• Resolve conflicts with the VS Code merge editor
  

🔀 Divergent changes

• Show divergent changes in the graph and change view
• Allow all meaningful operations on divergent changes

🏷️ Bookmark/Tag management

• Create, move, and delete bookmarks
• Set and delete tags

💼 Multi-Workspace support

• Show workspace labels in the graph view
• Handle "workspace is stale" errors

🔄 Operation management

• Browse the operations log with quick undo/redo buttons
  
• Undo any jj operation or restore repository to a previous state

📋 Prerequisites

• Ensure jj is installed and available in your system's $PATH, or configure a custom path using the jjx.jjPath setting
• Ensure jj is of a recent version (>=0.38.0)

🐛 Known issues

If you encounter any problems, please report them on GitHub!

🔧 Troubleshooting

Double modification annotations ("M, M") in file explorer

If you see annotations like "M, M" next to files, this is caused by VS Code's built-in Git extension running alongside JJX. To disable Git, disable git.enabled in your VS Code settings.

📝 License

This project is licensed under the AGPL-3.0 License. Code from the original project Jujutsu Kaizen is licensed under the MIT License. See LICENSE.md for details.