209 lines
6.6 KiB
EmacsLisp
209 lines
6.6 KiB
EmacsLisp
;;; packages.el --- Source Control Layer packages File for Spacemacs
|
|
;;
|
|
;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(setq version-control-packages
|
|
'(
|
|
browse-at-remote
|
|
diff-mode
|
|
diff-hl
|
|
evil-unimpaired
|
|
git-gutter
|
|
git-gutter+
|
|
git-gutter-fringe
|
|
git-gutter-fringe+
|
|
(smerge-mode :location built-in)
|
|
))
|
|
|
|
(defun version-control/init-diff-mode ()
|
|
(use-package diff-mode
|
|
:defer t))
|
|
|
|
(defun version-control/init-diff-hl ()
|
|
(use-package diff-hl
|
|
:init
|
|
(progn
|
|
(setq diff-hl-side 'left)
|
|
(when (eq version-control-diff-tool 'diff-hl)
|
|
(when (configuration-layer/package-used-p 'magit)
|
|
(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh))
|
|
(when version-control-global-margin
|
|
(global-diff-hl-mode))
|
|
(diff-hl-margin-mode)
|
|
(spacemacs|do-after-display-system-init
|
|
(setq diff-hl-side (if (eq version-control-diff-side 'left)
|
|
'left 'right))
|
|
(diff-hl-margin-mode -1))))))
|
|
|
|
(defun version-control/post-init-evil-unimpaired ()
|
|
(define-key evil-normal-state-map (kbd "[ h") 'spacemacs/vcs-previous-hunk)
|
|
(define-key evil-normal-state-map (kbd "] h") 'spacemacs/vcs-next-hunk))
|
|
|
|
(defun version-control/init-git-gutter ()
|
|
(use-package git-gutter
|
|
:commands (global-git-gutter-mode git-gutter-mode)
|
|
:init
|
|
(progn
|
|
;; If you enable global minor mode
|
|
(when (and (eq version-control-diff-tool 'git-gutter)
|
|
version-control-global-margin)
|
|
(run-with-idle-timer 1 nil 'global-git-gutter-mode))
|
|
(setq git-gutter:update-interval 2
|
|
git-gutter:modified-sign " "
|
|
git-gutter:added-sign "+"
|
|
git-gutter:deleted-sign "-"
|
|
git-gutter:diff-option "-w"
|
|
git-gutter:hide-gutter t
|
|
git-gutter:ask-p nil
|
|
git-gutter:verbosity 0
|
|
git-gutter:handled-backends '(git hg bzr svn)
|
|
git-gutter:hide-gutter t))
|
|
:config
|
|
(spacemacs|hide-lighter git-gutter-mode)))
|
|
|
|
(defun version-control/init-git-gutter-fringe ()
|
|
(use-package git-gutter-fringe
|
|
:commands git-gutter-mode
|
|
:init
|
|
(progn
|
|
(spacemacs|do-after-display-system-init
|
|
(with-eval-after-load 'git-gutter
|
|
(require 'git-gutter-fringe)))
|
|
(setq git-gutter-fr:side (if (eq version-control-diff-side 'left)
|
|
'left-fringe 'right-fringe)))
|
|
:config
|
|
(progn
|
|
;; custom graphics that works nice with half-width fringes
|
|
(fringe-helper-define 'git-gutter-fr:added nil
|
|
"..X...."
|
|
"..X...."
|
|
"XXXXX.."
|
|
"..X...."
|
|
"..X...."
|
|
)
|
|
(fringe-helper-define 'git-gutter-fr:deleted nil
|
|
"......."
|
|
"......."
|
|
"XXXXX.."
|
|
"......."
|
|
"......."
|
|
)
|
|
(fringe-helper-define 'git-gutter-fr:modified nil
|
|
"..X...."
|
|
".XXX..."
|
|
"XX.XX.."
|
|
".XXX..."
|
|
"..X...."
|
|
))))
|
|
|
|
(defun version-control/init-git-gutter+ ()
|
|
(use-package git-gutter+
|
|
:commands (global-git-gutter+-mode git-gutter+-mode git-gutter+-refresh)
|
|
:init
|
|
(progn
|
|
;; If you enable global minor mode
|
|
(when (and (eq version-control-diff-tool 'git-gutter+)
|
|
version-control-global-margin)
|
|
(add-hook 'magit-pre-refresh-hook 'git-gutter+-refresh)
|
|
(run-with-idle-timer 1 nil 'global-git-gutter+-mode))
|
|
(setq
|
|
git-gutter+-modified-sign " "
|
|
git-gutter+-added-sign "+"
|
|
git-gutter+-deleted-sign "-"
|
|
git-gutter+-diff-option "-w"
|
|
git-gutter+-hide-gutter t))
|
|
;; identify magit changes
|
|
:config
|
|
(spacemacs|hide-lighter git-gutter+-mode)
|
|
;; (set-face-foreground 'git-gutter+-modified "black")
|
|
;; (set-face-foreground 'git-gutter+-added "black")
|
|
;; (set-face-foreground 'git-gutter+-deleted "black")
|
|
;; (set-face-background 'git-gutter+-modified "orange1")
|
|
;; (set-face-background 'git-gutter+-added "green4")
|
|
;; (set-face-background 'git-gutter+-deleted "red3")
|
|
))
|
|
|
|
(defun version-control/init-git-gutter-fringe+ ()
|
|
(use-package git-gutter-fringe+
|
|
:commands git-gutter+-mode
|
|
:init
|
|
(progn
|
|
(spacemacs|do-after-display-system-init
|
|
(with-eval-after-load 'git-gutter+
|
|
(require 'git-gutter-fringe+)))
|
|
(setq git-gutter-fr+-side (if (eq version-control-diff-side 'left)
|
|
'left-fringe 'right-fringe)))
|
|
:config
|
|
(progn
|
|
;; custom graphics that works nice with half-width fringes
|
|
(fringe-helper-define 'git-gutter-fr+-added nil
|
|
"..X...."
|
|
"..X...."
|
|
"XXXXX.."
|
|
"..X...."
|
|
"..X...."
|
|
)
|
|
(fringe-helper-define 'git-gutter-fr+-deleted nil
|
|
"......."
|
|
"......."
|
|
"XXXXX.."
|
|
"......."
|
|
"......."
|
|
)
|
|
(fringe-helper-define 'git-gutter-fr+-modified nil
|
|
"..X...."
|
|
".XXX..."
|
|
"XX.XX.."
|
|
".XXX..."
|
|
"..X...."
|
|
))))
|
|
|
|
|
|
(defun version-control/init-smerge-mode ()
|
|
(use-package smerge-mode
|
|
:defer t
|
|
:diminish smerge-mode
|
|
:commands spacemacs/smerge-transient-state/body
|
|
:init
|
|
(spacemacs/set-leader-keys
|
|
"gr" 'spacemacs/smerge-transient-state/body)
|
|
:config
|
|
(progn
|
|
(spacemacs|define-transient-state smerge
|
|
:title "smerge transient state"
|
|
:doc "
|
|
movement^^^^ merge action^^ other
|
|
---------------------^^^^ -------------------^^ -----------
|
|
[_n_]^^ next hunk [_b_] keep base [_u_] undo
|
|
[_N_/_p_] prev hunk [_m_] keep mine [_r_] refine
|
|
[_j_/_k_] move up/down [_a_] keep all [_q_] quit
|
|
^^^^ [_o_] keep other
|
|
^^^^ [_c_] keep current
|
|
^^^^ [_C_] combine with next"
|
|
:bindings
|
|
("n" smerge-next)
|
|
("p" smerge-prev)
|
|
("N" smerge-prev)
|
|
("j" evil-next-line)
|
|
("k" evil-previous-line)
|
|
("a" smerge-keep-all)
|
|
("b" smerge-keep-base)
|
|
("m" smerge-keep-mine)
|
|
("o" smerge-keep-other)
|
|
("c" smerge-keep-current)
|
|
("C" smerge-combine-with-next)
|
|
("r" smerge-refine)
|
|
("u" undo-tree-undo)
|
|
("q" nil :exit t)))))
|
|
|
|
(defun version-control/init-browse-at-remote ()
|
|
(use-package browse-at-remote
|
|
:defer t
|
|
:init (spacemacs/set-leader-keys "gho" 'browse-at-remote)))
|