d8b1e469bc
+ :popup -> set-popup-rule! + :popups -> set-popup-rules! + :company-backend -> set-company-backend! + :evil-state -> set-evil-initial-state! I am slowly phasing out the setting system (def-setting! and set!), starting with these. What are autodefs? These are functions that are always defined, whether or not their respective modules are enabled. However, when their modules are disabled, they are replaced with macros that no-op and don't waste time evaluating their arguments. The old set! function will still work, for a while.
67 lines
2.5 KiB
EmacsLisp
67 lines
2.5 KiB
EmacsLisp
;;; feature/version-control/config.el -*- lexical-binding: t; -*-
|
|
|
|
(load! "+git")
|
|
;; TODO (load! "+hg")
|
|
|
|
;;
|
|
(setq vc-make-backup-files nil)
|
|
|
|
(defvar +vcs-auto-hydra-smerge t
|
|
"When entering `smerge-mode' automatically open associated hydra.")
|
|
|
|
|
|
(after! vc-annotate
|
|
(set-popup-rules!
|
|
'(("^\\vc-d" nil ((select))) ; *vc-diff*
|
|
("^\\vc-c" nil ((select . t))))) ; *vc-change-log*
|
|
(set-evil-initial-state!
|
|
'(vc-annotate-mode vc-git-log-view-mode)
|
|
'normal))
|
|
|
|
(def-package! smerge-mode
|
|
:hook (find-file . +vcs|enable-smerge-mode-maybe)
|
|
:config
|
|
(unless EMACS26+
|
|
(with-no-warnings
|
|
(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 (:hint nil
|
|
:pre (smerge-mode 1)
|
|
;; Disable `smerge-mode' when quitting hydra if
|
|
;; no merge conflicts remain.
|
|
:post (smerge-auto-leave))
|
|
"
|
|
╭────────┐
|
|
Movement Keep Diff Other │ smerge │
|
|
╭─────────────────────────────────────────────────┴────────╯
|
|
^_g_^ [_b_] base [_<_] upper/base [_C_] Combine
|
|
^_C-k_^ [_u_] upper [_=_] upper/lower [_r_] resolve
|
|
^_k_ ↑^ [_l_] lower [_>_] base/lower [_R_] remove
|
|
^_j_ ↓^ [_a_] all [_H_] hightlight
|
|
^_C-j_^ [_RET_] current [_E_] ediff ╭──────────
|
|
^_G_^ │ [_q_] quit"
|
|
("g" (progn (goto-char (point-min)) (smerge-next)))
|
|
("G" (progn (goto-char (point-max)) (smerge-prev)))
|
|
("C-j" smerge-next)
|
|
("C-k" smerge-prev)
|
|
("j" next-line)
|
|
("k" previous-line)
|
|
("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 :color blue)))
|