Commit graph

82 commits

Author SHA1 Message Date
Bjarke Vad Andersen
cb4a156087 'magit-blame' renamed to 'magit-blame-addition' 2018-11-01 00:53:13 +02:00
deb0ch
a23055b6cd add magit buffers to useless buffers 2018-10-26 10:46:53 +01:00
deb0ch
2ac7ee8f9b
magit: enable colors in magit-log 2018-10-06 09:47:11 +03:00
Evan Klitzke
95f276bd21 Add helm-git-grep to the git layer 2018-09-04 00:06:03 +03:00
Ruslan Kamashev
ecc7eeda74 Add gitignore-templates 2018-07-03 23:48:50 +03:00
dh
496eb1db56 cleanup & change keybinding of magit-svn-popup 2018-05-27 22:46:44 +03:00
dh
24ba77e775 install magit-svn by default 2018-05-27 22:46:44 +03:00
dh
8cd8197348 enable magit-svn by default 2018-05-27 22:46:44 +03:00
syl20bnr
45e0c08c72 dump: require magit when dumping 2018-05-20 03:58:48 -04:00
Ag Ibragimov
5cdfeef2fa git: adds SPC g f d - for magit-diff-buffer-file-popup 2018-05-15 01:33:30 +03:00
Ag Ibragimov
d691b916cd git: changes SPC g f h to SPC g f l - for 'git log' of current file 2018-05-15 01:33:30 +03:00
syl20bnr
ebe4c60264 Revert "Defer packages by default using use-package-always-defer"
This reverts commit 29c78ce841 and all other fixes
that have been made afterwards.

The motivation is that use-package is seen by many as a replacement for
`require`. Is use-package always defer the loading of packages then is breaks
this use case, this does not respect POLA so even if it was making Spacemacs
loading faster (up to 3s faster on some startup on my machine) we just cannot
use it, it would be irresponsible. Spacemacs should be easy to use, loading
performance will come with time but it is not a priority.
2018-03-03 23:40:10 -05:00
syl20bnr
29c78ce841 Defer packages by default using use-package-always-defer
Warning now `:defer t` is implied, to force a package to load `:demand t` is
now necessary.
2018-02-27 23:32:52 -05:00
syl20bnr
6cd0cc31fc git: move evil-magit use-package hook declaration to pre-init 2018-01-10 23:33:15 -05:00
syl20bnr
42adde95ec git: remove old evilification of magit buffers 2018-01-10 23:33:03 -05:00
syl20bnr
269c385560 git: add use-package for defered loading of evil-magit 2018-01-10 23:32:49 -05:00
Muneeb Shaikh
4a34ef4673 git: toggle evil-magit based on editing style
Fix #10078
Fix #10054
2018-01-10 22:21:38 -05:00
syl20bnr
326965d4ce Happy New Year 2018! 2018-01-04 02:00:25 -05:00
Eivind Fonn
f4b53d2a4f Rename :depends to :requires 2017-07-03 09:54:53 +02:00
syl20bnr
e2e532bb49 core: change <function>p to <function>-p suffixes for consistency
Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 10:09:39 -04:00
Eivind Fonn
08561d8631 core: implement :depends for package declarations
This replaces the older pattern
:toggle (configuration-layer/package-usedp ..)

This implementation ensures that :disabled-for honors dependent packages, i.e.
if package a depends on package b, which is owned by layer c, and layer c is
disabled for layer d, then neither package a nor b will be configured for layer
d. Previously, this was only true for package a, but not b.

This commit also fixes:

- configuration-layer/describe-package now shows which post-init and pre-init
  functions are disabled, if any
- Does not recreate all layer objects unconditionally when calling
  configuration-layer/discover-layers. Previously, this led to all layers being
  recreated after e.g. `SPC h SPC`, without any of the dotfile information.
  Since this information is now necessary for
  configuration-layer/describe-package, it’s important that we don’t clear the
  indexed layers when invoking this function.
2017-06-22 11:53:05 +02:00
d12frosted
d8c00ffd34 install orgit only when org package is used
Fixes #8890
2017-06-19 11:17:10 +02:00
duianto
116c51520e Add a key binding for magit-find-file
problem:  currently, viewing a file at a specific branch/commit, requires one to
          type the magit-find-file command, at the M-x prompt
solution: SPC g f f is available and consistent with the SPC f f key binding
2017-05-18 18:40:34 +02:00
Steven Allen
6c0c4dcf37 Add keybindings for magit clone and init. 2017-05-14 22:04:02 -04:00
syl20bnr
fb27ede558 Bump year in copyright headers
Happy New Year 2017!
2017-01-05 23:08:17 -05:00
Justin Burkett
7bf00ad878 which-key: Update usage of replacement alists
See 19186917eb
2016-11-25 12:32:10 +02:00
Eoin Houlihan
7464ef32e2 Use Magit 2.8's built-in fullscreen display function 2016-10-17 14:11:28 +02:00
Ryan Phillips
cd6b5ed67b add magit-repolist support
fixes #7083
2016-10-17 14:07:58 +02:00
bmag
88e4ddf778 git: hook fci-mode only when fci package is used 2016-10-17 13:42:37 +02:00
syl20bnr
0a01159572 git: add SPC g f h to get the commit history of the current file 2016-07-28 23:26:54 -04:00
syl20bnr
140e779735 git: add SPC g l prefix command name 2016-07-05 00:23:16 -04:00
syl20bnr
316dc0765d git: move git-link to git layer under SPC g l command prefix
git-link is aimed to work with various git hosting services so it makes
sense to move it back to git layer.
2016-07-05 00:23:16 -04:00
syl20bnr
b92daec7cf git: remove all popup key binding for magit-dispatch-popup
The `SPC g` command prefix was to much overloaded for actions which
are already available in discoverable manner in magit. So I decided to
remove all the actions reachable from magit-dispatch-popup from `SPC g`.
magit-dispatch-popup is available under `SPC g m`. This increases the
key binding sequences but OTHO it makes everythings consistent (same
key sequence behind `SPC g s` and `SPC g m`) and we prefer consistency.

This refactoring free up a lot of precious key bindings we can use for
commands that are not available in Magit.
2016-07-05 00:23:16 -04:00
syl20bnr
a2de9a63af Use :toggle keyword instead of when forms 2016-05-29 22:39:21 -04:00
syl20bnr
1f993bddf6 Rename spacemacs-helm and spacemacs-ivy layers to helm and ivy
For ivy users: be sure to update your dotfile by replacing spacemacs-ivy
by ivy
2016-05-15 22:24:27 -04:00
Robert O'Connor
55ebd1e679 git: add submodule popup keybinding 2016-05-06 13:04:06 +02:00
Magnus Therning
5c575a7eb8 git: Add binding to magit-reset-popup
Signed-off-by: Magnus Therning <magnus@therning.org>
2016-04-08 17:43:35 +02:00
syl20bnr
82fdd9a511 Use evil in holy-mode
Motivation

While disabling Evil in holy-mode makes its implementation shorter and
sounds elegant on the paper, in practice it puts a big burden on the
configuration parts which need to know if Evil is enable or not. This is
a bad separation of concerns and the bunch of fixes that we were forced
to do in the past weeks shows this issue. Those fixes were about
removing the knowledge of the activation of Evil by implementing new
dispatching functions to be used by layers, this is cumbersome and makes
Spacemacs layer configuration more subtle which is not good. There was
additional bad consequences of the removal of Evil state like the
impossibility to use Evil lisp state or iedit states, or we would have
been forced to implement a temporary activation of Evil which is
awkward.

Instead I reintroduce Evil as the central piece of Spacemacs design thus
Evil is now re-enabled in holy-mode. It provides the abstraction we need
to isolate editing styles and be able to grow the Spacemacs
configuration coverage sanely. Layers don't need to check whether the
holy mode is active or not and they don't need to know if Evil is
available (it is always available). We also don't need to write
additional dispatching functions, this is the job of Evil, and I think
it provides everything for this. Ideally configuration layer should be
implemented with only Evil in mind and the holy-mode (and hybrid-mode)
should magically make it work for Emacs style users, for instance we can
freely use `evil-insert-state` anywhere in the code without any guard.

Evil is now even more part of Spacemacs, we can really say that
Spacemacs is Emacs+Evil which is now an indivisible pair. Spacemacs
needed this stable API to continue on the right track.

While these changes should be rather transparent to the user, I'm sorry
for this experimental period, I failed to see all the implications of
such a change, I was just excited about the possibility to make Evil
optional. The reality is that Spacemacs has to embrace it and keep its
strong position on being Emacs+Evil at the core.

Implementation

- insert, motion and normal states are forced to emacs state using an
advice on `evil-insert-state`, `evil-motion-state` and
`evil-normal-state` respectively. These functions can be used freely in
the layer configuration.
- A new general hook `spacemacs-editing-style-hook` allow to hook any
code that need to be configured based on the editing style. Functions
hooked to this hook takes the current style as parameter, this
basically generalize the hook used to setup hjkl navigation bindings.
- ESC has been removed from the emacs state map.
- Revert unneeded changes
  - Revert "evil: enter insert-state only from normal-state"
    commit bdd702dfbe.
  - Revert "avoid being evil in deft with emacs editing style"
    commit f3a16f49ed.

Additional changes

All editing style packages have been moved to a layer called
`spacemacs-editing-styles`

Notes

I did not have time to attack hybrid mode, I should be able to do it
later.
2016-03-13 21:16:55 -04:00
Muneeb Shaikh
f903460994 source-control: git-timemachine goto nth revision
Allows you to goto arbitrary revision by inputting rev number. e.g. To
goto 1st revision of the file, enter 1.
2016-03-12 17:51:50 +01:00
syl20bnr
de44ab15ba git: revert git blame transient state to micro state
To work this transient state needs to support a function as a
`:exit` value.
2016-01-26 01:21:01 -05:00
justbur
d2582fceec transient-state: Improve some docs 2016-01-26 01:21:01 -05:00
justbur
e97af03ff7 Call new micro-state a transient state 2016-01-26 01:21:00 -05:00
justbur
7b819fff5e git: Translate time-machine and git-blame micro-states 2016-01-26 01:20:59 -05:00
Robert O'Connor
c0e0702430 bind SPC gA to magit-cherry-pick-popup 2016-01-23 17:15:02 +01:00
Robert O'Connor
f86ec0e047 add magit-rebase-popup command to init function 2016-01-23 17:13:00 +01:00
Christoph Neuroth
1d76daeef7 Bind SPC g r to magit-rebase-popup 2016-01-21 21:53:52 +01:00
syl20bnr
046d86800c Clean copyrights and update for year 2016 2016-01-11 21:42:17 -05:00
justbur
b0ee301845 layers: Conditionally load helm packages
Only use them when the spacemacs-helm layer is used.
2016-01-09 13:36:03 -05:00
justbur
0b02475772 Use built-in evil functions to set default states
evil-set-initial-state is safer than manually adding and deleting from
the lists, because it knows about all available states and ensures that
the mode only shows up in one list. If it is in multiple list the
initial state depends on which is checked first, which we don't want.
2015-12-21 00:22:18 -05:00
syl20bnr
e3a816b37d org: move orgit to git layer and add documenation 2015-12-20 01:02:12 -05:00