2015-06-15 09:05:52 +02:00
|
|
|
;;; core-vcs.el --- version control awareness
|
|
|
|
|
|
|
|
(use-package gitconfig-mode
|
2015-08-13 12:14:41 -04:00
|
|
|
:mode ("/\\.?git/?config$" "/\\.gitmodules$")
|
2015-12-10 16:15:09 -05:00
|
|
|
:init (add-hook! gitconfig-mode 'flyspell-mode))
|
2015-06-15 09:05:52 +02:00
|
|
|
|
|
|
|
(use-package gitignore-mode
|
2015-08-13 12:14:41 -04:00
|
|
|
:mode ("/\\.gitignore$"
|
|
|
|
"/\\.git/info/exclude$"
|
|
|
|
"/git/ignore$"))
|
2015-06-15 09:05:52 +02:00
|
|
|
|
2015-12-11 16:51:04 -05:00
|
|
|
(use-package browse-at-remote
|
|
|
|
:defer t
|
2015-12-09 01:16:31 -05:00
|
|
|
:init
|
2015-12-23 03:45:38 -05:00
|
|
|
(evil-define-command narf:git-remote-browse (&optional bang file)
|
|
|
|
"Open the website for the current (or specified) version controlled FILE. If BANG,
|
|
|
|
then use hub to do it."
|
|
|
|
(interactive "<!><f>")
|
|
|
|
(if bang
|
|
|
|
(message "Url copied to clipboard: %s" (browse-at-remote/to-clipboard))
|
|
|
|
(browse-at-remote/browse))))
|
2015-12-09 01:16:31 -05:00
|
|
|
|
|
|
|
(use-package git-gutter
|
|
|
|
:commands (git-gutter-mode narf/vcs-next-hunk narf/vcs-prev-hunk
|
|
|
|
narf/vcs-show-hunk narf/vcs-stage-hunk narf/vcs-revert-hunk)
|
|
|
|
:init
|
2015-12-11 16:51:04 -05:00
|
|
|
(add-hook! (text-mode prog-mode conf-mode) 'git-gutter-mode)
|
2015-12-09 01:16:31 -05:00
|
|
|
:config
|
|
|
|
(require 'git-gutter-fringe)
|
|
|
|
|
|
|
|
(defalias 'narf/vcs-next-hunk 'git-gutter:next-hunk)
|
|
|
|
(defalias 'narf/vcs-prev-hunk 'git-gutter:previous-hunk)
|
|
|
|
(defalias 'narf/vcs-show-hunk 'git-gutter:popup-hunk)
|
|
|
|
(defalias 'narf/vcs-stage-hunk 'git-gutter:stage-hunk)
|
|
|
|
(defalias 'narf/vcs-revert-hunk 'git-gutter:revert-hunk)
|
|
|
|
|
|
|
|
(define-fringe-bitmap 'git-gutter-fr:added
|
|
|
|
[240 240 240 240 240 240 240 240 240 240 240 240 240 240]
|
|
|
|
nil nil 'center)
|
|
|
|
(define-fringe-bitmap 'git-gutter-fr:modified
|
|
|
|
[240 240 240 240 240 240 240 240 240 240 240 240 240 240]
|
|
|
|
nil nil 'center)
|
|
|
|
(define-fringe-bitmap 'git-gutter-fr:deleted
|
|
|
|
[0 0 0 128 192 224 240 248]
|
|
|
|
nil nil 'center)
|
|
|
|
|
|
|
|
(advice-add 'evil-force-normal-state :after 'git-gutter)
|
2015-12-11 16:51:04 -05:00
|
|
|
(add-hook! focus-in 'git-gutter:update-all-windows))
|
2015-12-09 01:16:31 -05:00
|
|
|
|
2015-12-11 16:51:04 -05:00
|
|
|
(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))
|
|
|
|
|
2015-06-15 09:05:52 +02:00
|
|
|
(provide 'core-vcs)
|
|
|
|
;;; core-vcs.el ends here
|