TakeV/spacemacs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
This repository has been archived on 2024-10-22. You can view files and clone it, but cannot push or open issues or pull requests.
spacemacs/layers/+source-control/git/packages.el

304 lines
10 KiB
EmacsLisp
Raw Normal View History

Update CONTRIBUTE.md and add file headers Also add default file header to layer templates.
2015-01-14 04:12:56 +00:00
;;; packages.el --- Git Layer packages File for Spacemacs
;;
;; Copyright (c) 2012-2014 Sylvain Benner
;; Copyright (c) 2014-2015 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
Reload dotfile and layer anywhere with `SPC f e R` Replace `SPC m c c` and `C-c C-c` in the dotfile Resolve #1210
2015-04-19 03:40:24 +00:00
(setq git-packages
Replace git-gutter with diff-hl Since both offer the same functionality, but except for staging hunk but it works only with Git anyway. diff-hl has the advantage that it is usable with left/right fringes and margin in a single package. Also it does not have the bugs that git-gutter is having.
2015-06-09 15:43:14 +00:00
'(
gitattributes-mode
gitconfig-mode
gitignore-mode
Make sure we use-package git-commit With the move to Magit 2.1.0, `git-commit-mode` is deprecated and no longer shipped in favor of the `git-commit` package, which is shipped separately from Magit. This ensures that the `git-commit` package is loaded so that using Spacemacs as your $GITEDITOR outside of Magit works as expected.
2015-07-09 22:52:18 +00:00
git-commit
Replace git-gutter with diff-hl Since both offer the same functionality, but except for staging hunk but it works only with Git anyway. diff-hl has the advantage that it is usable with left/right fringes and margin in a single package. Also it does not have the bugs that git-gutter is having.
2015-06-09 15:43:14 +00:00
git-messenger
git-timemachine
helm-gitignore
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
magit
reenabled magit-gitflow for magit 2.1
2015-07-25 14:44:18 +00:00
magit-gitflow
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
;; not compatible with magit 2.1 at the time of release
;; magit-svn
smeargle
))
Add magit-next as an extension (submodule) Set git-use-magit-next to t in the layer variable to use it. For now magit-ghpull from github layer is disabled. A LOT of issues with next magit and evil remain to be fixed
2015-06-24 03:52:24 +00:00
Add helm-gitignore to git layer
2015-05-18 02:43:42 +00:00
(defun git/init-helm-gitignore ()
(use-package helm-gitignore
:defer t
git layer: move helm-gitignore on `SPC g I`
2015-05-19 02:37:31 +00:00
:init (evil-leader/set-key "gI" 'helm-gitignore)))
Add helm-gitignore to git layer
2015-05-18 02:43:42 +00:00
Make sure we use-package git-commit With the move to Magit 2.1.0, `git-commit-mode` is deprecated and no longer shipped in favor of the `git-commit` package, which is shipped separately from Magit. This ensures that the `git-commit` package is loaded so that using Spacemacs as your $GITEDITOR outside of Magit works as expected.
2015-07-09 22:52:18 +00:00
(defun git/init-git-commit ()
git layer: defer loading of git-commit
2015-07-26 05:03:30 +00:00
(use-package git-commit
:defer t))
Make sure we use-package git-commit With the move to Magit 2.1.0, `git-commit-mode` is deprecated and no longer shipped in favor of the `git-commit` package, which is shipped separately from Magit. This ensures that the `git-commit` package is loaded so that using Spacemacs as your $GITEDITOR outside of Magit works as expected.
2015-07-09 22:52:18 +00:00
Move git packages to git layer
2014-12-14 04:59:02 +00:00
(defun git/init-git-messenger ()
(use-package git-messenger
:defer t
:init
added escape to gitmessenger keybindings
2015-07-25 11:47:20 +00:00
(evil-leader/set-key
"gm" 'git-messenger:popup-message)
:config
(define-key git-messenger-map [escape] 'git-messenger:popup-close)
))
Move git packages to git layer
2014-12-14 04:59:02 +00:00
(defun git/init-git-timemachine ()
(use-package git-timemachine
:defer t
git timemachine micro state on 'SPC g t' On 'SPC g t', instead of calling git timemachine, wrap useful git timemachine functions inside a micro state.
2015-02-22 05:05:20 +00:00
:commands spacemacs/time-machine-micro-state
Move git packages to git layer
2014-12-14 04:59:02 +00:00
:init
(evil-leader/set-key
git timemachine micro state on 'SPC g t' On 'SPC g t', instead of calling git timemachine, wrap useful git timemachine functions inside a micro state.
2015-02-22 05:05:20 +00:00
"gt" 'spacemacs/time-machine-micro-state)
:config
(progn
Add support for golden ratio to git machine micro-state
2015-02-22 06:46:36 +00:00
(defun spacemacs//time-machine-ms-on-enter ()
"Initiate git-timemachine properly with goden-ratio support."
(let ((golden-ratio (when (boundp 'golden-ratio-mode)
golden-ratio-mode)))
(when (bound-and-true-p golden-ratio-mode) (golden-ratio-mode -1))
(git-timemachine)
(when golden-ratio (golden-ratio-mode))))
git timemachine micro state on 'SPC g t' On 'SPC g t', instead of calling git timemachine, wrap useful git timemachine functions inside a micro state.
2015-02-22 05:05:20 +00:00
(spacemacs|define-micro-state time-machine
when the shortcut was changed the timemachine description line was not updated
2015-03-04 16:10:04 +00:00
:doc "[p] [N] previous [n] next [c] current [Y] copy hash [q] quit"
Add support for golden ratio to git machine micro-state
2015-02-22 06:46:36 +00:00
:on-enter (spacemacs//time-machine-ms-on-enter)
git timemachine micro state on 'SPC g t' On 'SPC g t', instead of calling git timemachine, wrap useful git timemachine functions inside a micro state.
2015-02-22 05:05:20 +00:00
:on-exit (git-timemachine-quit)
:persistent t
:bindings
("c" git-timemachine-show-current-revision)
("p" git-timemachine-show-previous-revision)
("n" git-timemachine-show-next-revision)
Add support for golden ratio to git machine micro-state
2015-02-22 06:46:36 +00:00
("N" git-timemachine-show-previous-revision)
Bind `Y` instead of `y` to copy commit hash in git-timemachine micro-state
2015-03-03 09:01:05 +00:00
("Y" git-timemachine-kill-revision)
Add support for golden ratio to git machine micro-state
2015-02-22 06:46:36 +00:00
("q" nil :exit t)))))
Move git packages to git layer
2014-12-14 04:59:02 +00:00
Add modes for Git related files
2015-03-26 16:10:54 +00:00
(defun git/init-gitattributes-mode ()
(use-package gitattributes-mode
:defer t))
git layer: add init functions for gitconfig and git-commit modes
2015-03-28 03:51:08 +00:00
(defun git/init-gitconfig-mode ()
(use-package gitconfig-mode
:defer t))
Add modes for Git related files
2015-03-26 16:10:54 +00:00
(defun git/init-gitignore-mode ()
(use-package gitignore-mode
:defer t))
Move git packages to git layer
2014-12-14 04:59:02 +00:00
(defun git/init-magit ()
(use-package magit
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
:commands (magit-status
magit-blame-mode
magit-log
magit-commit)
Move git packages to git layer
2014-12-14 04:59:02 +00:00
:init
New evil state `evilified` + support for dynamic toggle of holy-mode Key binding on `SPC P <tab>` in the pair programming prefix.
2015-03-23 03:11:00 +00:00
(progn
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
(setq magit-completing-read-function 'magit-builtin-completing-read)
Enable fci-mode in git-commit-mode Having fci-mode to visually indicate the limit of commit message region is nice. With it, we know exactly our text does not cross the limit (i.e 72 columns). Sometimes, text can cross the boundary if we add something but use C-n or j to move to next line.
2015-04-22 10:44:28 +00:00
(add-hook 'git-commit-mode-hook 'fci-mode)
Enable Magit authentication on Windows On Windows, we must use Git GUI to enter username and password, otherwise git process just hangs there when we try to push.
2015-04-04 10:36:50 +00:00
;; On Windows, we must use Git GUI to enter username and password
;; See: https://github.com/magit/magit/wiki/FAQ#windows-cannot-push-via-https
[fix] Only use ask password with GUI in Windows
2015-04-11 17:22:37 +00:00
(when (eq window-system 'w32)
(setenv "GIT_ASKPASS" "git-gui--askpass"))
Evilify magit-diff and update README with new `SPC g d` binding
2015-06-16 01:55:57 +00:00
(defun spacemacs/magit-diff-head ()
"Execute `magit-diff' against current HEAD."
(interactive)
(magit-diff "HEAD"))
New evil state `evilified` + support for dynamic toggle of holy-mode Key binding on `SPC P <tab>` in the pair programming prefix.
2015-03-23 03:11:00 +00:00
(evil-leader/set-key
[git] Bind `magit-blame` rather than `magit-blame-mode` to "gb". Calling `magit-blame-mode` directly is not advised as of Magit 2.1.0, and will leave a buffer in read-only mode upon exit. `magit-blame` also allows recursive blame upon repeated usage.
2015-07-04 01:32:12 +00:00
"gb" 'magit-blame
Use magit-log-all in place of magit-log magit-log-all has the same with the old magit-log: show the commit log immediately without asking for revision. We should use magit-git-log for smoother transition to magit 2.1.
2015-07-02 06:41:10 +00:00
"gl" 'magit-log-all
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
"gL" 'magit-log-buffer-file
evilified: Generalize fix for key binding passthrough in visual state
2015-05-02 04:38:48 +00:00
"gs" 'magit-status
Evilify magit-diff and update README with new `SPC g d` binding
2015-06-16 01:55:57 +00:00
"gd" 'spacemacs/magit-diff-head
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
"gC" 'magit-commit))
Move git packages to git layer
2014-12-14 04:59:02 +00:00
:config
(progn
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
;; seems to be necessary at the time of release
(require 'git-rebase)
;; mode maps
(spacemacs|evilify-map magit-mode-map)
(spacemacs|evilify-map magit-status-mode-map
:mode magit-status-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-refs-mode-map
:mode magit-refs-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-blame-mode-map
:mode magit-blame-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
evilify magit-hunk-section-map
2015-08-31 22:08:49 +00:00
(spacemacs|evilify-map magit-hunk-section-map
:mode magit-status-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
(spacemacs|evilify-map magit-diff-mode-map
:mode magit-diff-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-log-read-revs-map
:mode magit-log-read-revs
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-log-mode-map
:mode magit-log-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-log-select-mode-map
:mode magit-log-select-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-cherry-mode-map
:mode magit-cherry-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-reflog-mode-map
:mode magit-reflog-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-process-mode-map
:mode magit-process-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map git-rebase-mode-map
:mode git-rebase-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward
"J" 'git-rebase-move-line-down
"K" 'git-rebase-move-line-up
"u" 'git-rebase-undo
"y" 'git-rebase-insert)
;; default state for additional modes
(dolist (mode '(magit-popup-mode
magit-popup-sequence-mode))
(add-to-list 'evil-emacs-state-modes mode))
(spacemacs/evilify-configure-default-state 'magit-revision-mode)
;; section maps
(spacemacs|evilify-map magit-tag-section-map)
(spacemacs|evilify-map magit-untracked-section-map)
(spacemacs|evilify-map magit-branch-section-map)
(spacemacs|evilify-map magit-remote-section-map)
(spacemacs|evilify-map magit-file-section-map)
(spacemacs|evilify-map magit-hunk-section-map)
(spacemacs|evilify-map magit-unstaged-section-map)
(spacemacs|evilify-map magit-staged-section-map)
(spacemacs|evilify-map magit-commit-section-map)
(spacemacs|evilify-map magit-module-commit-section-map)
(spacemacs|evilify-map magit-unpulled-section-map)
(spacemacs|evilify-map magit-unpushed-section-map)
(spacemacs|evilify-map magit-stashes-section-map)
(spacemacs|evilify-map magit-stash-section-map)
Correctly toggle magit status fullscreen feature using variable `git-magit-status-fullscreen`
2015-01-04 17:11:13 +00:00
;; full screen magit-status
(when git-magit-status-fullscreen
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
(setq magit-restore-window-configuration t)
(setq magit-status-buffer-switch-function
(lambda (buffer)
(pop-to-buffer buffer)
(delete-other-windows))))
;; rebase mode
(evil-leader/set-key-for-mode 'git-rebase-mode
"mcc" 'git-rebase-server-edit
"mk" 'git-rebase-abort)
;; commit mode
(evil-leader/set-key-for-mode 'git-commit-mode
"mcc" 'git-commit-commit
"mk" 'git-commit-abort)
Move git packages to git layer
2014-12-14 04:59:02 +00:00
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
;; whitespace
Move git packages to git layer
2014-12-14 04:59:02 +00:00
(defun magit-toggle-whitespace ()
(interactive)
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
(if (member "-w" (if (derived-mode-p 'magit-diff-mode)
magit-refresh-args
magit-diff-section-arguments))
Move git packages to git layer
2014-12-14 04:59:02 +00:00
(magit-dont-ignore-whitespace)
(magit-ignore-whitespace)))
(defun magit-ignore-whitespace ()
(interactive)
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
(add-to-list (if (derived-mode-p 'magit-diff-mode)
'magit-refresh-args 'magit-diff-section-arguments) "-w")
Move git packages to git layer
2014-12-14 04:59:02 +00:00
(magit-refresh))
(defun magit-dont-ignore-whitespace ()
(interactive)
Make magit 2.1 the official magit version for spacemacs
2015-07-02 04:36:26 +00:00
(setq magit-diff-options
(remove "-w"
(if (derived-mode-p 'magit-diff-mode)
magit-refresh-args
magit-diff-section-arguments))) (magit-refresh))
(define-key magit-status-mode-map (kbd "C-S-w")
'magit-toggle-whitespace))))
Move git packages to git layer
2014-12-14 04:59:02 +00:00
(defun git/init-magit-gitflow ()
(use-package magit-gitflow
:commands turn-on-magit-gitflow
add #f magit binding for magit-gitflow-popup
2015-08-04 20:26:22 +00:00
:init (progn
(add-hook 'magit-mode-hook 'turn-on-magit-gitflow)
(eval-after-load 'magit
'(progn
(define-key magit-mode-map "#f" 'magit-gitflow-popup))))
Move git packages to git layer
2014-12-14 04:59:02 +00:00
:config (spacemacs|diminish magit-gitflow-mode "Flow")))
Add magit-svn plugin to git layer
2015-01-27 05:17:51 +00:00
(defun git/init-magit-svn ()
(use-package magit-svn
Install all packages in the git layer The variable are now only used to enable or disable the packages. This approach allow better discovery of git layer packages in helm-spacemacs
2015-01-27 05:23:14 +00:00
:if git-enable-magit-svn-plugin
Add magit-svn plugin to git layer
2015-01-27 05:17:51 +00:00
:commands turn-on-magit-svn
:init (add-hook 'magit-mode-hook 'turn-on-magit-svn)
:config
(progn
(evil-define-key 'emacs magit-status-mode-map
"N" 'magit-key-mode-popup-svn))))
Move git packages to git layer
2014-12-14 04:59:02 +00:00
(defun git/init-smeargle ()
(use-package smeargle
:defer t
:init
Add some missing key prefix declarations
2015-08-07 01:40:28 +00:00
(progn
(spacemacs/declare-prefix "gh" "smeargle")
(evil-leader/set-key
"ghc" 'smeargle-clear
"ghh" 'smeargle-commits
"ght" 'smeargle))))
Reference in a new issue Copy permalink