X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/98230edd817bc40419520433a30807474581bebc..3164eec6216006fa61f0ad0c12d57d6a90da85c3:/contrib/stgit.el diff --git a/contrib/stgit.el b/contrib/stgit.el index 5ed8f4e..0c39286 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -55,7 +55,7 @@ directory DIR or `default-directory'" (car buffers) (create-stgit-buffer dir))))) (defstruct (stgit-patch) - status name desc empty) + status name desc empty files-ewoc) (defun stgit-patch-pp (patch) (let ((status (stgit-patch-status patch)) @@ -77,10 +77,9 @@ directory DIR or `default-directory'" (if (stgit-patch-empty patch) "(empty) " "") (propertize (or (stgit-patch-desc patch) "") 'face 'stgit-description-face)) - (add-text-properties start (point) (list 'entry-type 'patch - 'stgit-patchsym name)) + (put-text-property start (point) 'entry-type 'patch) (when (memq name stgit-expanded-patches) - (stgit-insert-patch-files name)) + (stgit-insert-patch-files patch)) (put-text-property start (point) 'patch-data patch))) (defun create-stgit-buffer (dir) @@ -280,17 +279,18 @@ flag, which reduces performance." (unknown "Unknown" stgit-unknown-file-face))) "Alist of code symbols to description strings") -(defun stgit-file-status-code-as-string (code) - "Return stgit status code as string" - (let ((str (assq (if (consp code) (car code) code) - stgit-file-status-code-strings))) - (when str +(defun stgit-file-status-code-as-string (file) + "Return stgit status code for FILE as a string" + (let* ((code (assq (stgit-file-status file) + stgit-file-status-code-strings)) + (score (stgit-file-cr-score file))) + (when code (format "%-11s " - (if (and str (consp code) (/= (cdr code) 100)) - (format "%s %s" (cdr str) - (propertize (format "%d%%" (cdr code)) + (if (and score (/= score 100)) + (format "%s %s" (cdr code) + (propertize (format "%d%%" score) 'face 'stgit-description-face)) - (cdr str)))))) + (cdr code)))))) (defun stgit-file-status-code (str &optional score) "Return stgit status code from git status string" @@ -362,68 +362,91 @@ Cf. `stgit-file-type-change-string'." (propertize (format "%o" new-perm) 'face 'stgit-file-permission-face))))))) -(defun stgit-insert-patch-files (patchsym) - (let* ((start (point)) - (result (with-output-to-string - (stgit-run-git "diff-tree" "-r" "-z" - (if stgit-expand-find-copies-harder - "--find-copies-harder" - "-C") - (stgit-id patchsym))))) - (let (mstart) - (while (string-match "\0:\\([0-7]+\\) \\([0-7]+\\) [0-9A-Fa-f]\\{40\\} [0-9A-Fa-f]\\{40\\} \\(\\([CR]\\)\\([0-9]*\\)\0\\([^\0]*\\)\0\\([^\0]*\\)\\|\\([ABD-QS-Z]\\)\0\\([^\0]*\\)\\)" - result mstart) - (let ((copy-or-rename (match-string 4 result)) - (old-perm (read (format "#o%s" (match-string 1 result)))) - (new-perm (read (format "#o%s" (match-string 2 result)))) - (line-start (point)) - status - change - (properties '(entry-type file))) - (if copy-or-rename - (let ((cr-score (match-string 5 result)) - (cr-from-file (match-string 6 result)) - (cr-to-file (match-string 7 result))) - (setq status (stgit-file-status-code copy-or-rename - cr-score) - properties (list* 'stgit-old-file cr-from-file - 'stgit-new-file cr-to-file - properties) - change (concat - cr-from-file - (propertize " -> " - 'face 'stgit-description-face) - cr-to-file))) - (setq status (stgit-file-status-code (match-string 8 result)) - properties (list* 'stgit-file (match-string 9 result) - properties) - change (match-string 9 result))) - - (let ((mode-change (stgit-file-mode-change-string old-perm - new-perm))) - (insert "\n " - (format "%-12s" (stgit-file-status-code-as-string - status)) +(defstruct (stgit-file) + old-perm new-perm copy-or-rename cr-score cr-from cr-to status file) + +(defun stgit-file-pp (file) + (let ((status (stgit-file-status file)) + (name (if (stgit-file-copy-or-rename file) + (concat (stgit-file-cr-from file) + (propertize " -> " + 'face 'stgit-description-face) + (stgit-file-cr-to file)) + (stgit-file-file file))) + (mode-change (stgit-file-mode-change-string + (stgit-file-old-perm file) + (stgit-file-new-perm file))) + (start (point))) + (insert (format " %-12s%1s%s%s\n" + (stgit-file-status-code-as-string file) mode-change - (if (> (length mode-change) 0) " " "") - change - (propertize (stgit-file-type-change-string old-perm - new-perm) + name + (propertize (stgit-file-type-change-string + (stgit-file-old-perm file) + (stgit-file-new-perm file)) 'face 'stgit-description-face))) - (add-text-properties line-start (point) properties)) - (setq mstart (match-end 0)))) - (when (= start (point)) - (insert " \n")) - (put-text-property start (point) 'stgit-file-patchsym patchsym))) + (add-text-properties start (point) + (list 'entry-type 'file + 'file-data file)))) + +(defun stgit-insert-patch-files (patch) + "Expand (show modification of) the patch with name PATCHSYM (a +symbol) after the line at point. +`stgit-expand-find-copies-harder' controls how hard to try to +find copied files." + (insert "\n") + (let* ((patchsym (stgit-patch-name patch)) + (end (progn (insert "#") (prog1 (point-marker) (forward-char -1)))) + (args (list "-r" "-z" (if stgit-expand-find-copies-harder + "--find-copies-harder" + "-C"))) + (ewoc (ewoc-create #'stgit-file-pp nil nil t))) + (setf (stgit-patch-files-ewoc patch) ewoc) + (with-temp-buffer + (apply 'stgit-run-git "diff-tree" + (append args (list (stgit-id patchsym)))) + (goto-char (point-min)) + (forward-char 41) + (while (looking-at ":\\([0-7]+\\) \\([0-7]+\\) [0-9A-Fa-f]\\{40\\} [0-9A-Fa-f]\\{40\\} ") + (let ((old-perm (string-to-number (match-string 1) 8)) + (new-perm (string-to-number (match-string 2) 8))) + (goto-char (match-end 0)) + (let ((file + (cond ((looking-at + "\\([CR]\\)\\([0-9]*\\)\0\\([^\0]*\\)\0\\([^\0]*\\)\0") + (make-stgit-file + :old-perm old-perm + :new-perm new-perm + :copy-or-rename t + :cr-score (string-to-number (match-string 2)) + :cr-from (match-string 3) + :cr-to (match-string 4) + :status (stgit-file-status-code (match-string 1)) + :file (match-string 3))) + ((looking-at "\\([ABD-QS-Z]\\)\0\\([^\0]*\\)\0") + (make-stgit-file + :old-perm old-perm + :new-perm new-perm + :copy-or-rename nil + :cr-score nil + :cr-from nil + :cr-to nil + :status (stgit-file-status-code (match-string 1)) + :file (match-string 2)))))) + (ewoc-enter-last ewoc file)) + (goto-char (match-end 0)))) + (unless (ewoc-nth ewoc 0) + (ewoc-set-hf ewoc "" (propertize " \n" + 'face 'stgit-description-face)))) + (goto-char end) + (delete-char -2))) (defun stgit-select-file () - (let ((patched-file (stgit-patched-file-at-point))) - (unless patched-file - (error "No patch or file on the current line")) - (let ((filename (expand-file-name (cdr patched-file)))) - (unless (file-exists-p filename) - (error "File does not exist")) - (find-file filename)))) + (let ((filename (expand-file-name + (stgit-file-file (stgit-patched-file-at-point))))) + (unless (file-exists-p filename) + (error "File does not exist")) + (find-file filename))) (defun stgit-select-patch () (let ((patchname (stgit-patch-name-at-point))) @@ -450,7 +473,7 @@ Cf. `stgit-file-type-change-string'." (let ((patched-file (stgit-patched-file-at-point))) (unless patched-file (error "No file on the current line")) - (let ((filename (expand-file-name (cdr patched-file)))) + (let ((filename (expand-file-name (stgit-file-file patched-file)))) (unless (file-exists-p filename) (error "File does not exist")) (find-file-other-window filename)))) @@ -567,23 +590,11 @@ Commands: (defun stgit-add-mark (patchsym) "Mark the patch PATCHSYM." - (setq stgit-marked-patches (cons patchsym stgit-marked-patches)) - (save-excursion - (when (stgit-goto-patch patchsym) - (move-to-column 1) - (let ((inhibit-read-only t)) - (insert-and-inherit ?*) - (delete-char 1))))) + (setq stgit-marked-patches (cons patchsym stgit-marked-patches))) (defun stgit-remove-mark (patchsym) "Unmark the patch PATCHSYM." - (setq stgit-marked-patches (delq patchsym stgit-marked-patches)) - (save-excursion - (when (stgit-goto-patch patchsym) - (move-to-column 1) - (let ((inhibit-read-only t)) - (insert-and-inherit ? ) - (delete-char 1))))) + (setq stgit-marked-patches (delq patchsym stgit-marked-patches))) (defun stgit-clear-marks () "Unmark all patches." @@ -601,29 +612,8 @@ If CAUSE-ERROR is not nil, signal an error if none found." (cause-error (error "No patch on this line"))))) -(defun stgit-patched-file-at-point (&optional both-files) - "Returns a cons of the patchsym and file name at point. For -copies and renames, return the new file if the patch is either -applied. If BOTH-FILES is non-nil, return a cons of the old and -the new file names instead of just one name." - (let ((patchsym (get-text-property (point) 'stgit-file-patchsym)) - (file (get-text-property (point) 'stgit-file))) - (cond ((not patchsym) nil) - (file (cons patchsym file)) - (both-files - (cons patchsym (cons (get-text-property (point) 'stgit-old-file) - (get-text-property (point) 'stgit-new-file)))) - (t - (let ((file-sym (save-excursion - (stgit-previous-patch) - (unless (eq (stgit-patch-name-at-point) - patchsym) - (error "Cannot find the %s patch" patchsym)) - (beginning-of-line) - (if (= (char-after) ?-) - 'stgit-old-file - 'stgit-new-file)))) - (cons patchsym (get-text-property (point) file-sym))))))) +(defun stgit-patched-file-at-point () + (get-text-property (point) 'file-data)) (defun stgit-patches-marked-or-at-point () "Return the symbols of the marked patches, or the patch on the current line." @@ -636,11 +626,13 @@ the new file names instead of just one name." (defun stgit-goto-patch (patchsym) "Move point to the line containing patch PATCHSYM. -If that patch cannot be found, return nil." - (let ((p (text-property-any (point-min) (point-max) - 'stgit-patchsym patchsym))) - (when p - (goto-char p) +If that patch cannot be found, do nothing." + (let ((node (ewoc-nth stgit-ewoc 0))) + (while (and node (not (eq (stgit-patch-name (ewoc-data node)) + patchsym))) + (setq node (ewoc-next stgit-ewoc node))) + (when node + (ewoc-goto-node stgit-ewoc node) (move-to-column goal-column)))) (defun stgit-init () @@ -653,20 +645,29 @@ If that patch cannot be found, return nil." (defun stgit-mark () "Mark the patch under point." (interactive) - (let ((patch (stgit-patch-name-at-point t))) - (stgit-add-mark patch)) + (let* ((node (ewoc-locate stgit-ewoc)) + (patch (ewoc-data node))) + (stgit-add-mark (stgit-patch-name patch)) + (ewoc-invalidate stgit-ewoc node)) (stgit-next-patch)) (defun stgit-unmark-up () "Remove mark from the patch on the previous line." (interactive) (stgit-previous-patch) - (stgit-remove-mark (stgit-patch-name-at-point t))) + (let* ((node (ewoc-locate stgit-ewoc)) + (patch (ewoc-data node))) + (stgit-remove-mark (stgit-patch-name patch)) + (ewoc-invalidate stgit-ewoc node)) + (move-to-column (stgit-goal-column))) (defun stgit-unmark-down () "Remove mark from the patch on the current line." (interactive) - (stgit-remove-mark (stgit-patch-name-at-point t)) + (let* ((node (ewoc-locate stgit-ewoc)) + (patch (ewoc-data node))) + (stgit-remove-mark (stgit-patch-name patch)) + (ewoc-invalidate stgit-ewoc node)) (stgit-next-patch)) (defun stgit-rename (name) @@ -781,16 +782,20 @@ If PATCHSYM is a keyword, returns PATCHSYM unmodified." (stgit-capture-output "*StGit patch*" (case (get-text-property (point) 'entry-type) ('file - (let ((patchsym (stgit-patch-name-at-point)) - (patched-file (stgit-patched-file-at-point t))) - (let ((id (stgit-id (car patched-file)))) - (if (consp (cdr patched-file)) - ;; two files (copy or rename) - (stgit-run-git "diff" "-C" "-C" (concat id "^") id "--" - (cadr patched-file) (cddr patched-file)) - ;; just one file - (stgit-run-git "diff" (concat id "^") id "--" - (cdr patched-file)))))) + (let* ((patched-file (stgit-patched-file-at-point)) + (patch-name (stgit-patch-name-at-point)) + (patch-id (stgit-id patch-name)) + (args (append (and (stgit-file-cr-from patched-file) + (if stgit-expand-find-copies-harder + '("--find-copies-harder") + '("-C"))) + (list (concat patch-id "^") patch-id) + '("--") + (if (stgit-file-copy-or-rename patched-file) + (list (stgit-file-cr-from patched-file) + (stgit-file-cr-to patched-file)) + (list (stgit-file-file patched-file)))))) + (apply 'stgit-run-git "diff" args))) ('patch (stgit-run "show" "-O" "--patch-with-stat" "-O" "-M" (stgit-patch-name-at-point)))