Function: majutsu-ediff--read-conflicted-file

majutsu-ediff--read-conflicted-file is a natively compiled function defined in majutsu-ediff.el.

Signature

(majutsu-ediff--read-conflicted-file &optional REV)

Documentation

Prompt for a conflicted file at REV.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-ediff.el
(defun majutsu-ediff--read-conflicted-file (&optional rev)
  "Prompt for a conflicted file at REV."
  (let* ((default-directory (majutsu-file--root))
         (entries (majutsu-jj-conflicted-files (or rev "@")))
         (choices (delq nil
                        (mapcar #'majutsu-ediff--conflicted-file-completion-entry
                                entries))))
    (cond
     ((null choices)
      (user-error "No conflicts found at revision %s" (or rev "@")))
     ((= (length choices) 1)
      (caar choices))
     (t
      (majutsu-completing-read "Resolve conflicts in" choices nil t nil
                               'majutsu-file-path-history
                               nil 'majutsu-file)))))