94 lines
3.5 KiB
EmacsLisp
94 lines
3.5 KiB
EmacsLisp
;;; core-vcs.el --- version control awareness
|
|
|
|
(use-package gitconfig-mode
|
|
:mode ("/\\.?git/?config$" "/\\.gitmodules$")
|
|
:init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
|
|
|
|
(use-package gitignore-mode
|
|
:mode ("/\\.gitignore$"
|
|
"/\\.git/info/exclude$"
|
|
"/git/ignore$"))
|
|
|
|
(use-package git-gutter
|
|
:commands (git-gutter-mode doom/vcs-next-hunk doom/vcs-prev-hunk
|
|
doom/vcs-show-hunk doom/vcs-stage-hunk doom/vcs-revert-hunk)
|
|
:init
|
|
(add-hook! (text-mode prog-mode conf-mode) 'git-gutter-mode)
|
|
:config
|
|
(require 'git-gutter-fringe)
|
|
(def-popup! "^\\*git-gutter.+\\*$" :align below :size 15 :noselect t :regexp t)
|
|
|
|
(define-fringe-bitmap 'git-gutter-fr:added
|
|
[224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224]
|
|
nil nil 'center)
|
|
(define-fringe-bitmap 'git-gutter-fr:modified
|
|
[224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224]
|
|
nil nil 'center)
|
|
(define-fringe-bitmap 'git-gutter-fr:deleted
|
|
[0 0 0 0 0 0 0 0 0 0 0 0 0 128 192 224 240 248]
|
|
nil nil 'center)
|
|
|
|
;; Refreshing git-gutter
|
|
(advice-add 'evil-force-normal-state :after 'git-gutter)
|
|
(add-hook 'focus-in-hook 'git-gutter:update-all-windows)
|
|
|
|
(defalias 'doom/vcs-next-hunk 'git-gutter:next-hunk)
|
|
(defalias 'doom/vcs-prev-hunk 'git-gutter:previous-hunk)
|
|
(defalias 'doom/vcs-show-hunk 'git-gutter:popup-hunk)
|
|
(defalias 'doom/vcs-stage-hunk 'git-gutter:stage-hunk)
|
|
(defalias 'doom/vcs-revert-hunk 'git-gutter:revert-hunk))
|
|
|
|
(use-package git-messenger
|
|
:commands git-messenger:popup-message
|
|
:init (defvar git-messenger-map (make-sparse-keymap))
|
|
:config
|
|
(def-popup! "*git-messenger*" :align left :size 55 :select t)
|
|
(setq git-messenger:show-detail t)
|
|
(map! :map git-messenger-map
|
|
"<escape>" 'git-messenger:popup-close
|
|
"q" 'git-messenger:popup-close))
|
|
|
|
(use-package magit
|
|
:commands (magit-status)
|
|
:config
|
|
(def-popup! (:custom (lambda (b &rest _) (derived-mode-p 'magit-mode)))
|
|
:align below :size 0.5)
|
|
|
|
;; Some wrassling must be done to get magit to kill itself, and trigger
|
|
;; shackle popup hooks.
|
|
(setq magit-bury-buffer-function
|
|
(lambda (&rest _) (doom/popup-close (selected-window)))
|
|
magit-display-buffer-function
|
|
(lambda (b)
|
|
(funcall (if (doom/popup-p (selected-window)) 'switch-to-buffer 'doom/popup-buffer) b)
|
|
(get-buffer-window b))
|
|
magit-display-file-buffer-function
|
|
(lambda (b)
|
|
(when doom-prev-buffer
|
|
(select-window (get-buffer-window doom-prev-buffer)))
|
|
(switch-to-buffer b)))
|
|
|
|
(add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode)
|
|
|
|
(require 'evil-magit)
|
|
(evil-set-initial-state 'magit-popup-mode 'normal))
|
|
|
|
(after! vc-annotate
|
|
(evil-set-initial-state 'vc-annotate-mode 'normal)
|
|
(evil-set-initial-state 'vc-git-log-view-mode 'normal)
|
|
(map! :map vc-annotate-mode-map
|
|
:n "q" 'kill-this-buffer
|
|
:n "d" 'vc-annotate-show-diff-revision-at-line
|
|
:n "D" 'vc-annotate-show-changeset-diff-revision-at-line
|
|
:n "SPC" 'vc-annotate-show-log-revision-at-line
|
|
:n "]]" 'vc-annotate-next-revision
|
|
:n "[[" 'vc-annotate-prev-revision
|
|
:n [tab] 'vc-annotate-toggle-annotation-visibility
|
|
:n "RET" 'vc-annotate-find-revision-at-line))
|
|
|
|
(use-package browse-at-remote
|
|
:commands (browse-at-remote/browse browse-at-remote/get-url))
|
|
|
|
(provide 'core-vcs)
|
|
;;; core-vcs.el ends here
|