2017-06-08 11:47:56 +02:00
|
|
|
;;; feature/version-control/config.el -*- lexical-binding: t; -*-
|
2017-02-03 20:29:09 -05:00
|
|
|
|
2017-04-16 20:36:15 -04:00
|
|
|
(setq vc-make-backup-files nil)
|
|
|
|
|
|
2017-07-02 16:29:46 +02:00
|
|
|
(defvar +vcs-auto-hydra-smerge t
|
|
|
|
|
"When entering `smerge-mode' automatically open associated hydra.")
|
|
|
|
|
|
2017-02-23 00:06:12 -05:00
|
|
|
(load! +git)
|
|
|
|
|
;; (load! +hg)
|
2017-02-03 20:29:09 -05:00
|
|
|
|
2017-02-23 00:06:12 -05:00
|
|
|
(after! vc-annotate
|
|
|
|
|
(set! :popup
|
2017-02-08 02:22:51 -05:00
|
|
|
'("*vc-diff*" :size 15 :noselect t)
|
2017-02-21 16:05:12 -05:00
|
|
|
'("*vc-change-log*" :size 15)
|
2017-02-08 02:22:51 -05:00
|
|
|
'(vc-annotate-mode :same t))
|
2017-02-03 20:29:09 -05:00
|
|
|
|
2017-06-19 00:22:04 +02:00
|
|
|
(set! :evil-state 'vc-annotate-mode 'normal)
|
|
|
|
|
(set! :evil-state 'vc-git-log-view-mode 'normal))
|
2017-07-02 16:29:46 +02:00
|
|
|
|
|
|
|
|
(def-package! smerge-mode
|
|
|
|
|
:init
|
|
|
|
|
(add-hook 'find-file-hook #'+vcs|enable-smerge-mode-maybe)
|
|
|
|
|
:config
|
|
|
|
|
(when (featurep! :feature hydra)
|
|
|
|
|
(require 'hydra)
|
|
|
|
|
|
|
|
|
|
(when (version< emacs-version "26")
|
|
|
|
|
(defalias 'smerge-keep-upper 'smerge-keep-mine)
|
|
|
|
|
(defalias 'smerge-keep-lower 'smerge-keep-other)
|
|
|
|
|
(defalias 'smerge-diff-base-upper 'smerge-diff-base-mine)
|
|
|
|
|
(defalias 'smerge-diff-upper-lower 'smerge-diff-mine-other)
|
|
|
|
|
(defalias 'smerge-diff-base-lower 'smerge-diff-base-other))
|
|
|
|
|
|
|
|
|
|
(defhydra +hydra-smerge (:color pink
|
|
|
|
|
:hint nil
|
|
|
|
|
:pre (smerge-mode 1)
|
|
|
|
|
;; Disable `smerge-mode' when quitting hydra if
|
|
|
|
|
;; no merge conflicts remain.
|
|
|
|
|
:post (smerge-auto-leave))
|
|
|
|
|
"
|
|
|
|
|
^Move^ ^Keep^ ^Diff^ ^Other^
|
|
|
|
|
^^-----------^^-------------------^^---------------------^^-------
|
|
|
|
|
_g_ _b_ase _<_: upper/base _C_ombine
|
|
|
|
|
^^ _u_pper _=_: upper/lower _r_esolve
|
|
|
|
|
_j_ _l_ower _>_: base/lower _R_emove
|
|
|
|
|
_k_ _a_ll _H_ighlight diff
|
|
|
|
|
^^ _RET_: current _E_diff
|
|
|
|
|
_G_ "
|
|
|
|
|
("g" (progn (goto-char (point-min)) (smerge-next)))
|
|
|
|
|
("G" (progn (goto-char (point-max)) (smerge-prev)))
|
|
|
|
|
("j" smerge-next)
|
|
|
|
|
("k" smerge-prev)
|
|
|
|
|
("b" smerge-keep-base)
|
|
|
|
|
("u" smerge-keep-upper)
|
|
|
|
|
("l" smerge-keep-lower)
|
|
|
|
|
("a" smerge-keep-all)
|
|
|
|
|
("RET" smerge-keep-current)
|
|
|
|
|
("\C-m" smerge-keep-current)
|
|
|
|
|
("<" smerge-diff-base-upper)
|
|
|
|
|
("=" smerge-diff-upper-lower)
|
|
|
|
|
(">" smerge-diff-base-lower)
|
|
|
|
|
("H" smerge-refine)
|
|
|
|
|
("E" smerge-ediff)
|
|
|
|
|
("C" smerge-combine-with-next)
|
|
|
|
|
("r" smerge-resolve)
|
|
|
|
|
("R" smerge-kill-current)
|
|
|
|
|
("q" nil "cancel" :color blue))))
|
