X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=setup%2Fmagit.el;h=8a3d27b3aa2ea1dd7d985f21c52cf1bdc7fb222f;hb=f81363fb8f1d2956fe94b381ba66e8514f1c08cc;hp=b3d0b70e8f3f2625712a87a4131c2ef8a5a4de55;hpb=fb68783132d083df71f445bd00b38eeada8e3aee;p=emacs-init.git diff --git a/setup/magit.el b/setup/magit.el index b3d0b70..8a3d27b 100644 --- a/setup/magit.el +++ b/setup/magit.el @@ -4,10 +4,41 @@ (or load-file-name (when (boundp 'bytecomp-filename) bytecomp-filename) buffer-file-name)))) - "magit")) -(require 'magit) + "magit/lisp")) + +(add-to-list 'load-path (concat (file-name-directory + (directory-file-name + (file-name-directory + (or load-file-name + (when (boundp 'bytecomp-filename) bytecomp-filename) + buffer-file-name)))) + "with-editor")) + +(add-to-list 'load-path (concat (file-name-directory + (directory-file-name + (file-name-directory + (or load-file-name + (when (boundp 'bytecomp-filename) bytecomp-filename) + buffer-file-name)))) + "auto-install")) + (require 'cl) +(if (not (functionp 'run-hook-wrapped)) + (defun run-hook-wrapped (hook wrap-function &rest args) + (loop for fn in hook + thereis (apply 'wrap-function fn args)))) + +(if (not (functionp 'process-live-p)) + (defun process-live-p (process) + (memq (process-status process) + '(run open listen connect stop)))) + +(require 'magit) + +(setq magit-refs-local-branch-format "%C %-48n %U%m\n") +(setq magit-refs-remote-branch-format "%C %-48n %m\n") + (when (eq system-type 'windows-nt) (require 'advice) @@ -34,26 +65,42 @@ ); End Windows-NT +(defadvice magit-mode-quit-window (around my-magit-mode-quit-window activate) + (letf (((symbol-function 'selected-window) (lambda ()))) + ad-do-it)) + (global-set-key "\C-cGS" 'magit-status) +(defun my-shell-command-to-string (cmd) + (shell-command cmd " *my-shell-command-to-string*") + (save-current-buffer + (set-buffer " *my-shell-command-to-string*") + (prog1 + (buffer-string) + (kill-buffer " *my-shell-command-to-string*")))) + +(defun git-repo-files () + (let ((default-directory (magit-toplevel default-directory))) + (split-string (my-shell-command-to-string "git ls-files") "\n"))) + (defun find-file-in-git-repo () (interactive) - (let* ((repo (magit-get-top-dir default-directory)) - (files (shell-command-to-string (format "cd %s && git ls-files" repo)))) + (let ((repo (magit-toplevel default-directory)) + (files (git-repo-files))) (find-file (concat repo (ido-completing-read "Find file in git repo: " (remove-if (lambda (x) (string= "" x)) - (split-string files "\n"))))))) + files)))))) -(defun grep-in-git-repo (regexp) - (interactive "sGrep files in Git repo regexp: ") - (let ((default-directory (magit-get-top-dir default-directory))) +(defun grep-in-git-repo (regexp &optional words-only) + (interactive "sGrep files in Git repo regexp: \nP") + (let ((default-directory (magit-toplevel default-directory))) (if (not default-directory) (error "not a Git directory")) - (grep (format "git ls-files -z | xargs -r0 grep -nH -E %s | cat -" - (shell-quote-argument regexp))))) + (grep (format "git ls-files -z | xargs -r0 grep -d skip -nH -E%s -- %s" + (if words-only " -w" "") (shell-quote-argument regexp))))) (setenv "GIT_PAGER" "cat") (setenv "GIT_MAN_VIEWER" "woman") @@ -61,7 +108,7 @@ (defun find-file-maybe-git (&optional nogit) (interactive "P") - (if (and (not nogit) (magit-get-top-dir default-directory)) + (if (and (not nogit) (magit-toplevel default-directory)) (call-interactively 'find-file-in-git-repo) (call-interactively 'ido-find-file))) @@ -70,17 +117,55 @@ (defun git-files-find-symbol (symbol) (interactive (list (read-string "Symbol: " (current-word)))) + (let ((dir (magit-toplevel default-directory))) + (if (not dir) (error "No git repository")) + (let ((default-directory dir)) + (grep (format "git ls-files -z | xargs -r0 grep -d skip -nwHF %s" symbol))))) + +(defun git-files-find-class-decl (symbol) + (interactive (list (read-string "Symbol: " (current-word)))) (let ((dir (magit-get-top-dir default-directory))) (if (not dir) (error "No git repository")) (let ((default-directory dir)) - (grep (format "git ls-files -z | xargs -r0 grep -nwHF %s | cat -" symbol))))) + (grep (format "git ls-files -z | xargs -r0 grep -nwHF %s | grep -Ew '(class|struct)' | cat -" + symbol))))) (global-set-key "\C-cGF" 'git-files-find-symbol) +(global-set-key "\C-cGC" 'git-files-find-class-decl) (defun dired-git-files () (interactive) - (let ((default-directory (magit-get-top-dir default-directory)) - (ls-lisp-use-insert-directory-program t)) - (dired (cons default-directory (split-string (shell-command-to-string "git ls-files") "\n"))))) + (let ((default-directory (magit-toplevel default-directory))\ + (ls-lisp-use-insert-directory-program t) + files) + (setq files (delete-if '(lambda (file) (string= file "")) + (split-string (shell-command-to-string "git ls-files") "\n"))) + (dired (cons default-directory files)))) (global-set-key "\C-cGD" 'dired-git-files) + +(defun dired-grep-git-files (regexp &optional words-only) + (interactive "sRegexp: \nP") + (let ((default-directory (magit-toplevel default-directory)) + (cmd (format "git ls-files -z | xargs -r0 grep -d skip -l -E%s -- %s" + (if words-only " -w" "") (shell-quote-argument regexp)))) + (if (not default-directory) + (error "not in Git repository")) + (setq files (delete-if '(lambda (file) (string= file "")) + (split-string (shell-command-to-string cmd) "\n"))) + (dired (cons default-directory files)))) + +(global-set-key "\C-cGH" 'dired-grep-git-files) + +(defun magit-svn-fetch () + (interactive) + (magit-run-git-async "svn" "fetch")) + +(define-key magit-mode-map "Nf" 'magit-svn-fetch) + +(defun magit-quit-window (&optional kill-buffer) + (interactive "P") + (quit-window kill-buffer)) + +; ignore whitespace +; (setq magit-diff-options '("-w"))