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@xxxxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
