Function: majutsu-jj-conflicted-files

majutsu-jj-conflicted-files is a natively compiled function defined in majutsu-jj.el.

Signature

(majutsu-jj-conflicted-files &optional REV FILESETS)

Documentation

Return conflicted file entries at REV using jj file list -T.

REV defaults to "@". FILESETS, when non-nil, is a string or list of jj fileset expressions used to restrict the query. Each returned entry is a plist with :path and :sides.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-jj.el
(defun majutsu-jj-conflicted-files (&optional rev filesets)
  "Return conflicted file entries at REV using `jj file list -T'.
REV defaults to \"@\".  FILESETS, when non-nil, is a string or list of jj
fileset expressions used to restrict the query.  Each returned entry is a
plist with `:path' and `:sides'."
  (let* ((filesets (cond
                    ((null filesets) nil)
                    ((listp filesets) filesets)
                    (t (list filesets))))
         (args (append (list "file" "list" "-r" (or rev "@")
                             "-T" majutsu-jj--conflicted-files-template)
                       (and filesets (cons "--" filesets)))))
    (delq nil
          (mapcar #'majutsu-jj--parse-conflicted-file-record
                  (apply #'majutsu-jj-items args)))))