[PATCH] Teach git.el to mark/unmark files by regexp

[PATCH] Teach git.el to mark/unmark files by regexp

[David Christensen]

Adds the functions git-mark-regexp and git-unmark-regexp to git.el.
Creates a mark-map keymap to support dired-like behavior for
marking/unmarking via regexp.  Also adds these functions to the
menubar.

Signed-off-by: David Christensen <david@endpoint.com>
---
 contrib/emacs/git.el |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index c1cf1cb..279610f 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -944,6 +944,27 @@ Return the list of files that haven't been handled."
   ; move back to goal column after invalidate
   (when goal-column (move-to-column goal-column)))
 
+(defun git-mark-regexp (re)
+  "Mark all files which match a provided regexp."
+  (interactive "sMark files matching regular expression: ")
+  (unless git-status (error "Not in git-status buffer."))
+  (ewoc-map (lambda (info) (unless (git-fileinfo->marked info)
+                             (when (string-match re (git-fileinfo->name info))
+                               (setf (git-fileinfo->marked info) t)))) git-status)
+  ; move back to goal column after invalidate
+  (when goal-column (move-to-column goal-column)))
+
+(defun git-unmark-regexp (re)
+  "Unmark all files which match a provided regexp."
+  (interactive "sUnmark files matching regular expression: ")
+  (unless git-status (error "Not in git-status buffer."))
+  (ewoc-map (lambda (info) (when (git-fileinfo->marked info)
+                             (when (string-match re (git-fileinfo->name info))
+                               (setf (git-fileinfo->marked info) nil)) t)) git-status)
+  ; move back to goal column after invalidate
+  (when goal-column (move-to-column goal-column)))
+
+
 (defun git-toggle-all-marks ()
   "Toggle all file marks."
   (interactive)
@@ -1420,9 +1441,11 @@ amended version of it."
   (let ((map (make-keymap))
         (commit-map (make-sparse-keymap))
         (diff-map (make-sparse-keymap))
-        (toggle-map (make-sparse-keymap)))
+        (toggle-map (make-sparse-keymap))
+        (mark-map (make-sparse-keymap)))
     (suppress-keymap map)
     (define-key map "?"   'git-help)
+    (define-key map "*"    mark-map)
     (define-key map "h"   'git-help)
     (define-key map " "   'git-next-file)
     (define-key map "a"   'git-add-file)
@@ -1469,6 +1492,9 @@ amended version of it."
     (define-key toggle-map "i" 'git-toggle-show-ignored)
     (define-key toggle-map "k" 'git-toggle-show-unknown)
     (define-key toggle-map "m" 'git-toggle-all-marks)
+    ; the mark submap
+    (define-key mark-map "%" 'git-mark-regexp)
+    (define-key mark-map "\C-?" 'git-unmark-regexp)
     (setq git-status-mode-map map))
   (easy-menu-define git-menu git-status-mode-map
     "Git Menu"
@@ -1499,8 +1525,10 @@ amended version of it."
       "--------"
       ["Mark" git-mark-file t]
       ["Mark All" git-mark-all t]
+      ["Mark Regexp" git-mark-regexp t]
       ["Unmark" git-unmark-file t]
       ["Unmark All" git-unmark-all t]
+      ["Unmark Regexp" git-unmark-regexp t]
       ["Toggle All Marks" git-toggle-all-marks t]
       ["Hide Handled Files" git-remove-handled t]
       "--------"
-- 
1.6.0.1.90.g27a6e.dirty

Re: [PATCH] Teach git.el to mark/unmark files by regexp

[Alexandre Julliard]

David Christensen <david@endpoint.com> writes:

> Adds the functions git-mark-regexp and git-unmark-regexp to git.el.
> Creates a mark-map keymap to support dired-like behavior for
> marking/unmarking via regexp.  Also adds these functions to the
> menubar.

I think that emulating dired behavior is a good idea, but you should go
all the way and make it fully compatible, unmark is supposed to be "* %"
with a prefix arg, and "* DEL" should be git-unmark-file-up.

-- 
Alexandre Julliard
julliard@winehq.org

Re: [PATCH] Teach git.el to mark/unmark files by regexp

[David Christensen]

>> Adds the functions git-mark-regexp and git-unmark-regexp to git.el.
>> Creates a mark-map keymap to support dired-like behavior for
>> marking/unmarking via regexp.  Also adds these functions to the
>> menubar.
>
> I think that emulating dired behavior is a good idea, but you should  
> go
> all the way and make it fully compatible, unmark is supposed to be  
> "* %"
> with a prefix arg, and "* DEL" should be git-unmark-file-up.


Sounds good; I'll review other mark-related dired bindings and see if  
there are other correspondences we can make, and then resubmit a patch.

Regards,

David
--
David Christensen
End Point Corporation
david@endpoint.com

[PATCH v2] Teach git.el to mark/unmark files by regexp

[David Christensen]

Teaches git-mark-regexp to respect a prefix argument as an indication
to unmark files.  Also adds other dired-like key bindings.

[PATCH] Teach git.el to mark/unmark files by regexp

[David Christensen]

Adds the functions git-mark-regexp and git-unmark-regexp to git.el.
Creates a mark-map keymap to support dired-like behavior for
marking/unmarking via regexp.  Also adds these functions to the
menubar.

Signed-off-by: David Christensen <david@endpoint.com>
---
 contrib/emacs/git.el |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 580652c..a982fbe 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -950,14 +950,18 @@ Return the list of files that haven't been handled."
   (when goal-column (move-to-column goal-column)))
 
 (defun git-mark-regexp (re)
-  "Mark all files which match a provided regexp."
-  (interactive "sMark files matching regular expression: ")
+  "Mark all files which match a provided regexp.  With prefix argument, unmark files which match."
+  (interactive
+   (list
+    (read-from-minibuffer (if current-prefix-arg "Unmark files matching regular expression: " "Mark files matching regular expression: "))))
   (unless git-status (error "Not in git-status buffer."))
-  (ewoc-map (lambda (info) (unless (git-fileinfo->marked info)
-                             (when (string-match re (git-fileinfo->name info))
-                               (setf (git-fileinfo->marked info) t)))) git-status)
-  ; move back to goal column after invalidate
-  (when goal-column (move-to-column goal-column)))
+  (if current-prefix-arg
+      (git-unmark-regexp re)
+    (ewoc-map (lambda (info) (unless (git-fileinfo->marked info)
+                               (when (string-match re (git-fileinfo->name info))
+                                 (setf (git-fileinfo->marked info) t)))) git-status)
+    ; move back to goal column after invalidate
+    (when goal-column (move-to-column goal-column))))
 
 (defun git-unmark-regexp (re)
   "Unmark all files which match a provided regexp."
@@ -1504,7 +1508,12 @@ amended version of it."
     (define-key toggle-map "m" 'git-toggle-all-marks)
     ; the mark submap
     (define-key mark-map "%" 'git-mark-regexp)
-    (define-key mark-map "\C-?" 'git-unmark-regexp)
+    (define-key mark-map "m" 'git-mark-file)
+    (define-key mark-map "u" 'git-unmark-file)
+    (define-key mark-map "t" 'git-toggle-all-marks)
+    (define-key mark-map "!" 'git-unmark-all)
+    (define-key mark-map "?" 'git-unmark-all)
+    (define-key mark-map "\C-?" 'git-unmark-file-up)
     (setq git-status-mode-map map))
   (easy-menu-define git-menu git-status-mode-map
     "Git Menu"
-- 
1.6.0.1.90.g27a6e.dirty