X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/6467d9763c390a8c6e47edc9a0ec36504018d5a9..d9473917238ce5d685d2c2b90eb2291938693703:/contrib/stgit.el diff --git a/contrib/stgit.el b/contrib/stgit.el index 01a44d2..f629593 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -64,34 +64,27 @@ directory DIR or `default-directory'" status name desc empty files-ewoc) (defun stgit-patch-pp (patch) - (let ((status (stgit-patch-status patch)) - (start (point)) - (name (stgit-patch-name patch))) - (case name - (:index (insert " " - (propertize "Index" - 'face 'stgit-index-work-tree-title-face))) - (:work (insert " " - (propertize "Work tree" - 'face 'stgit-index-work-tree-title-face))) - (t (insert (case status - ('applied "+") - ('top ">") - ('unapplied "-")) - (if (memq name stgit-marked-patches) - "*" " ") - (propertize (format "%-30s" - (symbol-name name)) - 'face (case status - ('applied 'stgit-applied-patch-face) - ('top 'stgit-top-patch-face) - ('unapplied 'stgit-unapplied-patch-face) - ('index nil) - ('work nil))) - " " - (if (stgit-patch-empty patch) "(empty) " "") - (propertize (or (stgit-patch-desc patch) "") - 'face 'stgit-description-face)))) + (let* ((status (stgit-patch-status patch)) + (start (point)) + (name (stgit-patch-name patch)) + (face (cdr (assq status stgit-patch-status-face-alist)))) + (insert (case status + ('applied "+") + ('top ">") + ('unapplied "-") + (t " ")) + (if (memq name stgit-marked-patches) + "*" " ")) + (if (memq status '(index work)) + (insert (propertize (if (eq status 'index) "Index" "Work tree") + 'face face)) + (insert (format "%-30s" + (propertize (symbol-name name) 'face face)) + " " + (if (stgit-patch-empty patch) "(empty) " "") + (propertize (or (stgit-patch-desc patch) "") + 'face 'stgit-description-face))) + (insert "\n") (put-text-property start (point) 'entry-type 'patch) (when (memq name stgit-expanded-patches) (stgit-insert-patch-files patch)) @@ -106,7 +99,7 @@ Argument DIR is the repository path." (setq default-directory dir) (stgit-mode) (set (make-local-variable 'stgit-ewoc) - (ewoc-create #'stgit-patch-pp "Branch:\n" "--")) + (ewoc-create #'stgit-patch-pp "Branch:\n\n" "--\n" t)) (setq buffer-read-only t)) buf)) @@ -198,7 +191,8 @@ Returns nil if there was no output." stgit-worktree-node nil) (let ((inserted-index (not stgit-show-worktree)) index-node - worktree-node) + worktree-node + all-patchsyms) (with-temp-buffer (let ((exit-status (stgit-run-silent "series" "--description" "--empty"))) (goto-char (point-min)) @@ -228,6 +222,7 @@ Returns nil if there was no output." (eq state 'unapplied))) (setq inserted-index t) (stgit-run-series-insert-index ewoc))) + (setq all-patchsyms (cons name all-patchsyms)) (ewoc-enter-last ewoc (make-stgit-patch :status state @@ -238,7 +233,9 @@ Returns nil if there was no output." (unless inserted-index (stgit-run-series-insert-index ewoc))) (setq stgit-index-node index-node - stgit-worktree-node worktree-node))) + stgit-worktree-node worktree-node + stgit-marked-patches (intersection stgit-marked-patches + all-patchsyms)))) (defun stgit-reload () "Update the contents of the StGit buffer." @@ -254,7 +251,7 @@ Returns nil if there was no output." (stgit-run-silent "branch") (buffer-substring (point-min) (1- (point-max)))) 'face 'stgit-branch-name-face) - "\n") + "\n\n") (if stgit-show-worktree "--" (propertize @@ -321,6 +318,11 @@ Returns nil if there was no output." "StGit mode face used for unknown file status" :group 'stgit) +(defface stgit-ignored-file-face + '((((class color) (background light)) (:foreground "grey60")) + (((class color) (background dark)) (:foreground "grey40"))) + "StGit mode face used for ignored files") + (defface stgit-file-permission-face '((((class color) (background light)) (:foreground "green" :bold t)) (((class color) (background dark)) (:foreground "green" :bold t))) @@ -354,9 +356,18 @@ flag, which reduces performance." (rename "Renamed" stgit-modified-file-face) (mode-change "Mode change" stgit-modified-file-face) (unmerged "Unmerged" stgit-unmerged-file-face) - (unknown "Unknown" stgit-unknown-file-face))) + (unknown "Unknown" stgit-unknown-file-face) + (ignore "Ignored" stgit-ignored-file-face))) "Alist of code symbols to description strings") +(defconst stgit-patch-status-face-alist + '((applied . stgit-applied-patch-face) + (top . stgit-top-patch-face) + (unapplied . stgit-unapplied-patch-face) + (index . stgit-index-work-tree-title-face) + (work . stgit-index-work-tree-title-face)) + "Alist of face to use for a given patch status") + (defun stgit-file-status-code-as-string (file) "Return stgit status code for FILE as a string" (let* ((code (assq (stgit-file-status file) @@ -375,6 +386,7 @@ flag, which reduces performance." (let ((code (assoc str '(("A" . add) ("C" . copy) ("D" . delete) + ("I" . ignore) ("M" . modify) ("R" . rename) ("T" . mode-change) @@ -474,13 +486,24 @@ Cf. `stgit-file-type-change-string'." "--find-copies-harder" "-C")) +(defun stgit-insert-ls-files (args file-flag) + (let ((start (point))) + (apply 'stgit-run-git + (append '("ls-files" "--exclude-standard" "-z") args)) + (goto-char start) + (while (looking-at "\\([^\0]*\\)\0") + (let ((name-len (- (match-end 0) (match-beginning 0)))) + (insert ":0 0 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 " file-flag "\0") + (forward-char name-len))))) + (defun stgit-insert-patch-files (patch) "Expand (show modification of) the patch PATCH after the line at point." (let* ((patchsym (stgit-patch-name patch)) - (end (progn (insert "#") (prog1 (point-marker) (forward-char -1)))) - (args (list "-z" (stgit-find-copies-harder-diff-arg))) - (ewoc (ewoc-create #'stgit-file-pp nil nil t))) + (end (point-marker)) + (args (list "-z" (stgit-find-copies-harder-diff-arg))) + (ewoc (ewoc-create #'stgit-file-pp nil nil t))) + (set-marker-insertion-type end t) (setf (stgit-patch-files-ewoc patch) ewoc) (with-temp-buffer (apply 'stgit-run-git @@ -490,6 +513,15 @@ at point." `("diff-index" ,@args "--cached" "HEAD")) (t `("diff-tree" ,@args "-r" ,(stgit-id patchsym))))) + + (when (and (eq patchsym :work)) + (when stgit-show-ignored + (stgit-insert-ls-files '("--ignored" "--others") "I")) + (when stgit-show-unknown + (stgit-insert-ls-files '("--others") "X")) + (sort-regexp-fields nil ":[^\0]*\0\\([^\0]*\\)\0" "\\1" + (point-min) (point-max))) + (goto-char (point-min)) (unless (or (eobp) (memq patchsym '(:work :index))) (forward-char 41)) @@ -529,10 +561,12 @@ at point." (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))) + (ewoc-set-hf ewoc "" + (concat " " + (propertize "" + 'face 'stgit-description-face) + "\n")))) + (goto-char end))) (defun stgit-select-file () (let ((filename (expand-file-name @@ -550,7 +584,10 @@ at point." (move-to-column (stgit-goal-column))) (defun stgit-select () - "Expand or collapse the current entry" + "With point on a patch, toggle showing files in the patch. + +With point on a file, open the associated file. Opens the target +file for (applied) copies and renames." (interactive) (case (get-text-property (point) 'entry-type) ('patch @@ -627,7 +664,9 @@ at point." (let ((toggle-map (make-keymap))) (suppress-keymap toggle-map) (mapc (lambda (arg) (define-key toggle-map (car arg) (cdr arg))) - '(("t" . stgit-toggle-worktree))) + '(("t" . stgit-toggle-worktree) + ("i" . stgit-toggle-ignored) + ("u" . stgit-toggle-unknown))) (setq stgit-mode-map (make-keymap)) (suppress-keymap stgit-mode-map) (mapc (lambda (arg) (define-key stgit-mode-map (car arg) (cdr arg))) @@ -875,6 +914,12 @@ working tree." (unless (memq patch-name '(:work :index)) (error "No index or working tree file on this line")) + (when (eq file-status 'ignore) + (error "Cannot revert ignored files")) + + (when (eq file-status 'unknown) + (error "Cannot revert unknown files")) + (let ((nfiles (+ (if rm-file 1 0) (if co-file 1 0)))) (when (yes-or-no-p (format "Revert %d file%s? " nfiles @@ -1021,6 +1066,8 @@ If PATCHSYM is a keyword, returns PATCHSYM unmodified." (error "No file on the current line")) (when (eq (stgit-file-status patched-file) 'unmerged) (error (substitute-command-keys "Use \\[stgit-resolve-file] to move an unmerged file to the index"))) + (when (eq (stgit-file-status patched-file) 'ignore) + (error "You cannot add ignored files to the index")) (let ((patch-name (stgit-patch-name-at-point))) (cond ((eq patch-name :work) (stgit-move-change-to-index (stgit-file-file patched-file))) @@ -1299,6 +1346,12 @@ This value is used as the default value for `stgit-show-worktree'." See also `stgit-show-worktree-mode'.") +(defvar stgit-show-ignored nil + "If nil, inhibit showing files ignored by git.") + +(defvar stgit-show-unknown nil + "If nil, inhibit showing files not registered with git.") + (defun stgit-toggle-worktree (&optional arg) "Toggle the visibility of the work tree. With arg, show the work tree if arg is positive. @@ -1314,4 +1367,28 @@ work tree will show up." (not stgit-show-worktree))) (stgit-reload)) +(defun stgit-toggle-ignored (&optional arg) + "Toggle the visibility of files ignored by git in the work +tree. With ARG, show these files if ARG is positive. + +Use \\[stgit-toggle-worktree] to show the work tree." + (interactive) + (setq stgit-show-ignored + (if (numberp arg) + (> arg 0) + (not stgit-show-ignored))) + (stgit-reload)) + +(defun stgit-toggle-unknown (&optional arg) + "Toggle the visibility of files not registered with git in the +work tree. With ARG, show these files if ARG is positive. + +Use \\[stgit-toggle-worktree] to show the work tree." + (interactive) + (setq stgit-show-unknown + (if (numberp arg) + (> arg 0) + (not stgit-show-unknown))) + (stgit-reload)) + (provide 'stgit)