;; TODO: link commits from vc-log to magit-show-commit ;; TODO: smerge-mode (require-package 'gitignore-mode) (require-package 'gitconfig-mode) (require-package 'git-messenger) ;; Though see also vc-annotate's "n" & "p" bindings (require-package 'git-timemachine) (when (maybe-require-package 'magit) (setq-default magit-process-popup-time 10 magit-diff-refine-hunk t magit-completing-read-function 'magit-ido-completing-read) ;; Hint: customize `magit-repo-dirs' so that you can use C-u M-F12 to ;; quickly open magit on any one of your projects. (global-set-key [(meta f12)] 'magit-status) (global-set-key (kbd "C-x g") 'magit-status) (global-set-key (kbd "C-x M-g") 'magit-dispatch-popup)) (after-load 'magit (define-key magit-status-mode-map (kbd "C-M-") 'magit-section-up) (add-hook 'magit-popup-mode-hook 'sanityinc/no-trailing-whitespace)) (require-package 'fullframe) (after-load 'magit (fullframe magit-status magit-mode-quit-window)) (when (maybe-require-package 'git-commit) (add-hook 'git-commit-mode-hook 'goto-address-mode)) ;; Convenient binding for vc-git-grep (global-set-key (kbd "C-x v f") 'vc-git-grep) ;;; git-svn support ;; (when (maybe-require-package 'magit-svn) ;; (require-package 'magit-svn) ;; (autoload 'magit-svn-enabled "magit-svn") ;; (defun sanityinc/maybe-enable-magit-svn-mode () ;; (when (magit-svn-enabled) ;; (magit-svn-mode))) ;; (add-hook 'magit-status-mode-hook #'sanityinc/maybe-enable-magit-svn-mode)) (after-load 'compile (dolist (defn (list '(git-svn-updated "^\t[A-Z]\t\\(.*\\)$" 1 nil nil 0 1) '(git-svn-needs-update "^\\(.*\\): needs update$" 1 nil nil 2 1))) (add-to-list 'compilation-error-regexp-alist-alist defn) (add-to-list 'compilation-error-regexp-alist (car defn)))) (defvar git-svn--available-commands nil "Cached list of git svn subcommands") (defun git-svn--available-commands () (or git-svn--available-commands (setq git-svn--available-commands (sanityinc/string-all-matches "^ \\([a-z\\-]+\\) +" (shell-command-to-string "git svn help") 1)))) (defun git-svn (dir command) "Run a git svn subcommand in DIR." (interactive (list (read-directory-name "Directory: ") (completing-read "git-svn command: " (git-svn--available-commands) nil t nil nil (git-svn--available-commands)))) (let* ((default-directory (vc-git-root dir)) (compilation-buffer-name-function (lambda (major-mode-name) "*git-svn*"))) (compile (concat "git svn " command)))) (require-package 'git-messenger) (global-set-key (kbd "C-x v p") #'git-messenger:popup-message) ;; http://emacs.stackexchange.com/a/17733 (global-git-commit-mode) (provide 'init-git)