feature/version-control => ui/vc-gutter, emacs/vc
Reorganize vcs functionality. Moves the custom fringe bitmaps into :ui vc-gutter.
This commit is contained in:
Henrik Lissner
parent
e05d7cfee0
commit
60779c9aed
11 changed files with 237 additions and 152 deletions
|
|
@ -1,78 +0,0 @@
|
|||
;;; feature/version-control/+git.el -*- lexical-binding: t; -*-
|
||||
|
||||
;; see https://chris.beams.io/posts/git-commit/
|
||||
(setq git-commit-fill-column 72
|
||||
git-commit-summary-max-length 50
|
||||
git-commit-style-convention-checks '(overlong-summary-line non-empty-second-line))
|
||||
|
||||
(when (featurep! :feature evil)
|
||||
(add-hook 'git-commit-mode-hook #'evil-insert-state))
|
||||
|
||||
|
||||
(def-package! git-gutter-fringe
|
||||
:defer t
|
||||
:init
|
||||
(defun +version-control|git-gutter-maybe ()
|
||||
"Enable `git-gutter-mode' in non-remote buffers."
|
||||
(when (and (buffer-file-name)
|
||||
(not (file-remote-p (buffer-file-name))))
|
||||
(require 'git-gutter-fringe)
|
||||
(git-gutter-mode +1)))
|
||||
(add-hook! (text-mode prog-mode conf-mode) #'+version-control|git-gutter-maybe)
|
||||
:config
|
||||
(set-popup-rule! "^\\*git-gutter" :select nil)
|
||||
|
||||
;; Update git-gutter on focus (in case I was using git externally)
|
||||
(add-hook 'focus-in-hook #'git-gutter:update-all-windows)
|
||||
|
||||
(defun +version-control|update-git-gutter (&rest _)
|
||||
"Refresh git-gutter on ESC. Return nil to prevent shadowing other
|
||||
`doom-escape-hook' hooks."
|
||||
(when git-gutter-mode
|
||||
(ignore (git-gutter))))
|
||||
|
||||
(add-hook 'doom-escape-hook #'+version-control|update-git-gutter t)
|
||||
|
||||
;; update git-gutter when using these commands
|
||||
(advice-add #'magit-stage :after #'+version-control|update-git-gutter)
|
||||
(advice-add #'magit-unstage :after #'+version-control|update-git-gutter)
|
||||
(advice-add #'magit-stage-file :after #'+version-control|update-git-gutter)
|
||||
(advice-add #'magit-unstage-file :after #'+version-control|update-git-gutter)
|
||||
|
||||
(defhydra +version-control@git-gutter
|
||||
(:body-pre (git-gutter-mode 1) :hint nil)
|
||||
"
|
||||
╭─────────────────┐
|
||||
Movement Hunk Actions Misc. │ gg: +%-4s(car (git-gutter:statistic))/ -%-3s(cdr (git-gutter:statistic)) │
|
||||
╭──────────────────────────────────┴─────────────────╯
|
||||
^_g_^ [_s_] stage [_R_] set start Rev
|
||||
^_k_^ [_r_] revert
|
||||
^↑ ^ [_m_] mark
|
||||
^↓ ^ [_p_] popup ╭──────────────────────
|
||||
^_j_^ │[_q_] quit
|
||||
^_G_^ │[_Q_] Quit and disable"
|
||||
("j" (progn (git-gutter:next-hunk 1) (recenter)))
|
||||
("k" (progn (git-gutter:previous-hunk 1) (recenter)))
|
||||
("g" (progn (goto-char (point-min)) (git-gutter:next-hunk 1)))
|
||||
("G" (progn (goto-char (point-min)) (git-gutter:previous-hunk 1)))
|
||||
("s" git-gutter:stage-hunk)
|
||||
("r" git-gutter:revert-hunk)
|
||||
("m" git-gutter:mark-hunk)
|
||||
("p" git-gutter:popup-hunk)
|
||||
("R" git-gutter:set-start-revision)
|
||||
("q" nil :color blue)
|
||||
("Q" (git-gutter-mode -1) :color blue)))
|
||||
|
||||
|
||||
(def-package! git-timemachine
|
||||
:defer t
|
||||
:config
|
||||
;; Sometimes I forget `git-timemachine' is enabled in a buffer, so instead of
|
||||
;; showing revision details in the minibuffer, show them in
|
||||
;; `header-line-format', which has better visibility.
|
||||
(setq git-timemachine-show-minibuffer-details t)
|
||||
(advice-add #'git-timemachine--show-minibuffer-details :override #'+vcs*update-header-line)
|
||||
|
||||
(after! evil
|
||||
;; Force evil to rehash keybindings for the current state
|
||||
(add-hook 'git-timemachine-mode-hook #'evil-force-normal-state)))
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
;;; feature/version-control/autoload.el -*- lexical-binding: t; -*-
|
||||
|
||||
;;;###autoload
|
||||
(defun +vcs-root ()
|
||||
"Return the root git repo URL for the current file."
|
||||
(require 'git-link)
|
||||
(let* ((remote (git-link--select-remote))
|
||||
(remote-url (git-link--remote-url remote))
|
||||
(remote-info (if remote-url (git-link--parse-remote remote-url))))
|
||||
(if remote-info
|
||||
(format "https://%s/%s" (car remote-info) (cadr remote-info))
|
||||
(error "Remote `%s' is unknown or contains an unsupported URL" remote))))
|
||||
|
||||
(defvar git-link-open-in-browser)
|
||||
;;;###autoload
|
||||
(defun +vcs/git-browse ()
|
||||
"Open the website for the current version controlled file. Fallback to
|
||||
repository root."
|
||||
(interactive)
|
||||
(require 'git-link)
|
||||
(cl-destructuring-bind (beg end)
|
||||
(if buffer-file-name (git-link--get-region))
|
||||
(let ((git-link-open-in-browser t))
|
||||
(git-link (git-link--select-remote) beg end))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +vcs/git-browse-issues ()
|
||||
"Open the issues page for current repo."
|
||||
(interactive)
|
||||
(browse-url (format "%s/issues" (+vcs-root))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +vcs/git-browse-pulls ()
|
||||
"Open the pull requests page for current repo."
|
||||
(interactive)
|
||||
(browse-url (format "%s/pulls" (+vcs-root))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +vcs*update-header-line (revision)
|
||||
"Show revision details in the header-line, instead of the minibuffer.
|
||||
|
||||
Sometimes I forget `git-timemachine' is enabled in a buffer. Putting revision
|
||||
info in the `header-line-format' is a good indication."
|
||||
(let* ((date-relative (nth 3 revision))
|
||||
(date-full (nth 4 revision))
|
||||
(author (if git-timemachine-show-author (concat (nth 6 revision) ": ") ""))
|
||||
(sha-or-subject (if (eq git-timemachine-minibuffer-detail 'commit) (car revision) (nth 5 revision))))
|
||||
(setq header-line-format
|
||||
(format "%s%s [%s (%s)]"
|
||||
(propertize author 'face 'git-timemachine-minibuffer-author-face)
|
||||
(propertize sha-or-subject 'face 'git-timemachine-minibuffer-detail-face)
|
||||
date-full date-relative))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +vcs|enable-smerge-mode-maybe ()
|
||||
"Auto-enable `smerge-mode' when merge conflict is detected."
|
||||
(save-excursion
|
||||
(goto-char (point-min))
|
||||
(when (re-search-forward "^<<<<<<< " nil :noerror)
|
||||
(smerge-mode 1)
|
||||
(when (and (featurep 'hydra)
|
||||
+vcs-auto-hydra-smerge)
|
||||
(+hydra-smerge/body)))))
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
;;; 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)))
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; feature/version-control/packages.el
|
||||
|
||||
;;; config.el
|
||||
;; n/a
|
||||
|
||||
;;; +git
|
||||
(unless (featurep! -git)
|
||||
(package! git-gutter-fringe)
|
||||
(package! git-link)
|
||||
(package! git-timemachine)
|
||||
(package! gitconfig-mode)
|
||||
(package! gitignore-mode))
|
||||
|
||||
;;; TODO +hg
|
||||
Loading…
Add table
Add a link
Reference in a new issue