git emacs mode patch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The attached patch makes it possible to toggle show/hide of files with 
up-to-date and unknown statuses with M-d and M-u.

Cheers,
Gábor Melis

Please CC me, I'm not on the list.
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index db87a37..2f993de 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -97,6 +97,16 @@ if there is already one that displays the same directory."
   :group 'git
   :type 'string)
 
+(defcustom git-hide-up-to-date t
+  "Hide files with up-to-date status by default."
+  :group 'git
+  :type 'boolean)
+
+(defcustom git-hide-unknown t
+  "Hide files with unknown status by default."
+  :group 'git
+  :type 'boolean)
+
 
 (defface git-status-face
   '((((class color) (background light)) (:foreground "purple")))
@@ -428,6 +438,7 @@ and returns the process output as a string."
     (?A 'added)
     (?D 'deleted)
     (?U 'unmerged)
+    (?H 'uptodate)
     (t nil)))
 
 (defun git-status-code-as-string (code)
@@ -1017,15 +1028,18 @@ and returns the process output as a string."
       (with-temp-buffer
         (git-run-command t nil "diff-index" "-z" "-M" "HEAD")
         (git-parse-status status)))
+    (unless (member 'up-to-date hidden-statuses)
       (with-temp-buffer
-        (git-run-command t nil "ls-files" "-z" "-u")
-        (git-parse-ls-unmerged status))
+        (git-run-command t nil "ls-files" "-z" "-t")
+        (git-parse-ls-files status 'unknown)))
+    (unless (member 'unknown hidden-statuses)
       (when (file-readable-p ".git/info/exclude")
         (with-temp-buffer
           (git-run-command t nil "ls-files" "-z" "-t" "-o"
                            "--exclude-from=.git/info/exclude"
-                           (concat "--exclude-per-directory=" git-per-dir-ignore-file))
-          (git-parse-ls-files status 'unknown)))
+                           (concat "--exclude-per-directory="
+                                   git-per-dir-ignore-file))
+          (git-parse-ls-files status 'unknown))))
     (git-refresh-files)
     (git-refresh-ewoc-hf status)
     ; move point to the current file name if any
@@ -1080,6 +1094,8 @@ and returns the process output as a string."
     (define-key map "U"   'git-revert-file)
     (define-key map "v"   'git-view-file)
     (define-key map "x"   'git-remove-handled)
+    (define-key map "\M-d" 'git-toggle-up-to-date)
+    (define-key map "\M-u" 'git-toggle-unknown)
     (define-key map "\C-?" 'git-unmark-file-up)
     (define-key map "\M-\C-?" 'git-unmark-all)
     ; the diff submap
@@ -1093,6 +1109,20 @@ and returns the process output as a string."
     (define-key diff-map "o" 'git-diff-file-other)
     (setq git-status-mode-map map)))
 
+(defun git-toggle-up-to-date ()
+  (interactive)
+  (if (member 'up-to-date hidden-statuses)
+      (setq hidden-statuses (remove 'up-to-date hidden-statuses))
+    (push 'up-to-date hidden-statuses))
+  (git-refresh-status))
+
+(defun git-toggle-unknown ()
+  (interactive)
+  (if (member 'unknown hidden-statuses)
+      (setq hidden-statuses (remove 'unknown hidden-statuses))
+    (push 'unknown hidden-statuses))
+  (git-refresh-status))
+
 ;; git mode should only run in the *git status* buffer
 (put 'git-status-mode 'mode-class 'special)
 
@@ -1112,6 +1142,11 @@ Commands:
   (let ((status (ewoc-create 'git-fileinfo-prettyprint "" "")))
     (set (make-local-variable 'git-status) status))
   (set (make-local-variable 'list-buffers-directory) default-directory)
+  (set (make-local-variable 'hidden-statuses) ())
+  (when git-hide-up-to-date
+    (push 'up-to-date hidden-statuses))
+  (when git-hide-unknown
+    (push 'unknown hidden-statuses))
   (run-hooks 'git-status-mode-hook)))
 
 (defun git-find-status-buffer (dir)

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]