feat(ediff): add majutsu-ediff integration

[0WD0]

No description provided.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

• 🔍 Trigger a full review

✨ Finishing touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch majutsu-ediff

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[Copilot]

Pull request overview

This pull request adds Ediff integration and conflict resolution support to Majutsu, an Emacs interface for the Jujutsu (jj) version control system. The changes replace the previous majutsu-diffedit functionality with a more comprehensive ediff-based solution and add native support for parsing and highlighting JJ-style conflict markers.

Changes:

• Adds majutsu-ediff.el with ediff integration for comparing revisions, resolving conflicts, and interactive diffedit
• Adds majutsu-conflict.el with parser and minor mode for JJ-style conflict markers (diff, snapshot, and git styles)
• Refactors selection clearing logic across multiple transient commands to use centralized majutsu-selection-clear
• Removes old diffedit implementations and updates transient menus

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
majutsu-ediff.el	New file providing ediff integration for revision comparison and conflict resolution
majutsu-conflict.el	New file with conflict marker parser, font-lock support, and minor mode for JJ conflicts
test/majutsu-ediff-test.el	Test suite for ediff diff range parsing
test/majutsu-conflict-test.el	Comprehensive tests for conflict parsing and font-lock
majutsu.el	Updates transient menu to use new ediff command, adds requires for new modules
majutsu-diff.el	Removes old diffedit functions, adds conflict resolution command, fixes section type bug
majutsu-evil.el	Adds evil keybindings for conflict mode
majutsu-file.el	Removes circular dependency, adds file reading utilities
majutsu-squash.el	Refactors to use centralized selection clearing, updates selection faces
majutsu-split.el	Refactors file selection to use transient-files, removes custom fileset logic
majutsu-restore.el	Refactors file selection similarly to split
majutsu-rebase.el	Updates selection faces for consistency
majutsu-new.el	Consolidates selection clearing
majutsu-duplicate.el	Consolidates selection clearing
majutsu-log.el	Refactors file path handling to use transient-files

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

Function majutsu-file-at-point is not defined anywhere in the codebase. This should likely be majutsu-section-file-at-point which is defined in majutsu-section.el.

[Copilot]

Function majutsu-file-at-point is not defined anywhere in the codebase. This should likely be majutsu-section-file-at-point which is defined in majutsu-section.el.

[Copilot]

Typo in prompt string: "file,s" should be "files"

Suggested change

	:prompt "Limit to file,s: "
	:prompt "Limit to files: "

[Copilot]

Typo in prompt string: "file,s" should be "files"

Suggested change

	:prompt "Limit to file,s: "
	:prompt "Limit to files: "

[Copilot]

Typo in prompt string: "file,s" should be "files"

Suggested change

	:prompt "Limit to file,s: "
	:prompt "Limit to files: "

[Copilot]

Function majutsu-file-at-point is not defined anywhere in the codebase. This should likely be majutsu-section-file-at-point which is defined in majutsu-section.el and handles file sections properly.

Suggested change

	(file (majutsu-file-at-point)))
	(file (majutsu-section-file-at-point)))