doomemacs/modules/feature/version-control/config.el

;;; 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" :select)       ; *vc-diff*
      ("^\\vc-c" :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)))
Major optimization refactor, across the board + enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster startup; ~5-20% general boost + reduce consing, function calls & garbage collection by preferring cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and various cl-lib filter/map/reduce functions) -- where possible + prefer functions with dedicated opcodes, like assq (see byte-defop's in bytecomp.el for more) + prefer pcase & cond (faster) over cl-case + general refactor for code readability + ensure naming & style conventions are adhered to + appease byte-compiler by marking unused variables with underscore + defer minor mode activation to after-init, emacs-startup or window-setup hooks; a customization opportunity for users + ensures custom functionality won't interfere with startup. 2017-06-08 11:47:56 +02:00			`;;; feature/version-control/config.el -- lexical-binding: t; --`
Add modules/feature/version-control 2017-02-03 20:29:09 -05:00
:boom: Change first arg of load! macro load!'s first argument is no longer a symbol (that will cause void-variable errors now) to save on unnecessary interning and simplify compile-time logic. It accepts any valid form that evaluates to a string now. If you use load!, you need to change its argument to a string! e.g. (load! +my-module) => (load! "+my-module") 2018-05-27 12:44:22 +02:00			`(load! "+git")`
			`;; TODO (load! "+hg")`
Update :feature version-control to support module flags 2017-07-29 00:27:20 +02:00
			`;;`
Rearrange .local file structure (voids previous cache structure) 2017-04-16 20:36:15 -04:00			`(setq vc-make-backup-files nil)`

Add: feature/version-control: smerge + hydra for smerge closes #5 2017-07-02 16:29:46 +02:00			`(defvar +vcs-auto-hydra-smerge t`
			"When entering `smerge-mode' automatically open associated hydra.")

Add modules/feature/version-control 2017-02-03 20:29:09 -05:00
Revert macros to ...! name convention (elisp doesn't like @...) 2017-02-23 00:06:12 -05:00			`(after! vc-annotate`
Introduce autodefs to replace some settings + :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. 2018-06-15 02:58:12 +02:00			`(set-popup-rules!`
:boom: Change set-popup-rule! usage Now accepts a flat plist of all its former parameters, including new :parameters and :actions properties to increase your control over the fate of your windows. The old usage of set-popup-rule! is deprecated and may not work right! The :ui popup module has also seen a major refactor to improve efficiency and load times. Sorry! This is the last "big" change before 2.1! 2018-06-18 02:26:05 +02:00			`'(("^\\vc-d" :select) ; vc-diff`
			`("^\\vc-c" :select t))) ; vc-change-log`
Introduce autodefs to replace some settings + :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. 2018-06-15 02:58:12 +02:00			`(set-evil-initial-state!`
			`'(vc-annotate-mode vc-git-log-view-mode)`
			`'normal))`
Add: feature/version-control: smerge + hydra for smerge closes #5 2017-07-02 16:29:46 +02:00
			`(def-package! smerge-mode`
Major refactor: use-package-always-defer = nil & use :hook Possibly breaking change: packages are no longer deferred by default. Addresses #286 2017-12-08 22:33:12 -05:00			`:hook (find-file . +vcs\|enable-smerge-mode-maybe)`
Add: feature/version-control: smerge + hydra for smerge closes #5 2017-07-02 16:29:46 +02:00			`:config`
Add EMACS26+ & EMACS27+ constants 2018-03-24 04:40:24 -04:00			`(unless EMACS26+`
feature/version-control: appease byte-compiler in Emacs 26 2017-12-10 15:12:17 -05:00			`(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)))`
Add: feature/version-control: smerge + hydra for smerge closes #5 2017-07-02 16:29:46 +02:00
Remove def-hydra! macro alias Causes byte-compilation issues and the alias is unnecessary. 2018-05-24 22:03:17 +02:00			`(defhydra +hydra-smerge (:hint nil`
			`:pre (smerge-mode 1)`
			;; Disable `smerge-mode' when quitting hydra if
			`;; no merge conflicts remain.`
			`:post (smerge-auto-leave))`
Add: feature/version-control: make smerge hydra prettier 2017-07-02 17:50:48 +02:00			`"`
			`╭────────┐`
			`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"`
Move feature/hydra into core-keybinds 2017-09-23 16:26:12 +02:00			`("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)))`