Commit graph

222 commits

Author SHA1 Message Date
Eric Zhang
a4801bec7b Fix magit conflicting with golden-ratio 2019-04-04 12:41:01 +02:00
duianto
95c2488c66 Show magit-log-select and diff in two windows 2019-04-03 22:35:26 +02:00
syl20bnr
b28f1a2aba github: add function to get repo for a forge notification error 2019-03-31 12:16:43 -04:00
duianto
3de7081950 Cleanup which-key names
Moved:
- ("ai" "irc") to both the `erc` and `rcirc` layers. They don't have to be
  renamed until the layers are loaded.

- ("ay" "ipython notebook") to the `ipython-notebook` layer.

- ("p$" "projects/shell")
  ("'"  "open shell")
  ("as" "shells")
  to the `shell` layer.

- The commands with keybindings from spacemacs-bootstrap/packages.el to
  spacemacs-defaults/keybindings.el.

Removed:
- ("gd" "diff") it seems to be an old group name, there's no `SPC g d` group at
  the moment.

- ("Re" "elisp") and ("Rp" "pcre") because they have moved to:
  ("xr" "regular expressions")
  ("xre" "elisp")
  ("xrp" "pcre")

- ("xm" "move") seems to be an old move text group, the current keybindings are
  `SPC x J` and `SPC x K` which opens the Move Text Transient State.

- ("b" "persp-buffers") because `SPC b` is also renamed as ("b" "buffers") which
  is more general and not persp-mode specific.
2019-02-18 14:35:00 -05:00
bmag
b364cd3c61 Transient and magit-svn fixes
- magit-svn-popup renamed to magit-svn (more fallout of Transient)
- more reliable placement of Transient cache files
2019-02-18 14:26:41 -05:00
syl20bnr
f6a42ef790 Reenable magit-gitflow 2019-02-18 12:56:45 -05:00
syl20bnr
79279f434b Disable magithub, please move it to your private layer is used 2019-02-18 12:55:22 -05:00
syl20bnr
dd59f30aae Temporarily disable magit-gitflow to be able to SPC g s 2019-02-18 11:31:38 -05:00
yuhan0
d325c5027c [git] Add init function for transient package 2019-02-18 11:17:32 -05:00
syl20bnr
0bc5b54ebf Call magit-diff instead of magit-diff-buffer-file 2019-02-16 10:21:45 -05:00
bmag
99b355e2fa Adapt for Magit's move to Transient
Magit now uses Transient instead of magit-popup, and we must adapt. Also had to
replace the recently removed magit-diff-buffer-file-popup with
magit-diff-buffer-file (similar but doesn't offer a popup before displaying the
diff).

Note some upstream packages haven't adapted to this change, but when they do we
might need similar fixes:
- magithub
- magit-gitflow
- magit-svn
2019-02-16 10:21:45 -05:00
syl20bnr
63f9a92348 Revert "Mention breaking change for pull key binding with GitHub and forge"
This reverts commit 36c1291081.
2019-02-16 09:53:34 -05:00
Robert O'Connor
0b5ae3ccbf Remove magit-gh-pulls as magithub is so much better! 2019-01-20 22:33:59 +02:00
emacspace
03cb987c6d documentation formatting: Sun Jan 20 15:34:11 UTC 2019 2019-01-20 15:45:54 +00:00
Voleking
a8567cbed3 Fix diff-hl-highlight function is set to nil 2019-01-20 17:12:53 +02:00
Anton-Latukha
059810f31d Fix magit-repository-directories documentation 2019-01-20 15:28:28 +02:00
emacspace
f2c17ba15f documentation formatting: Thu Jan 17 14:07:30 UTC 2019 2019-01-17 16:56:39 +02:00
syl20bnr
36c1291081 Mention breaking change for pull key binding with GitHub and forge 2019-01-17 09:01:12 -05:00
Miciah Masters
01e2db9c42 github: Update forge key bindings
Update the documentation for forge per upstream changes to key bindings in
evil-magit[1].

[1] 49978d07d3

* layers/+source-control/github/README.org: Update key bindings for forge.
2019-01-17 08:48:27 -05:00
emacspace
7353d5670f documentation formatting: Mon Jan 14 23:15:53 UTC 2019 2019-01-14 23:19:02 +00:00
Miciah Masters
07aa9b01ed github: Add forge
Note that Forge binds the ' key to the Forge dispatch popup, but evil-magit
binds the ' key to the submodule dispatch popup (see
https://github.com/emacs-evil/evil-magit/issues/54), and evil-magit's key
binding takes precedence with the vim editing style.  Because Forge's key
binding does not always work, it is omitted from the README.

Note also that Magit binds the % key to its worktree dispatch popup, but
Spacemacs binds the % key to the magit-gitflow popup, and Spacemacs's key
binding takes precedence.  Because there is no available key binding for
the worktree dispatch popup, Forge's key binding under that dispatch popup
is omitted from the README.

* CHANGELOG.develop:
* layers/+source-control/github/README.org: Update.
* layers/+source-control/github/packages.el (github-packages): Add forge.
(github/init-forge): Load forge after magit. Configure forge to use
spacemacs-cache-directory.
(github/init-magithub): Disabling injecting issues and pull-requests
sections if forge is installed.
2019-01-15 00:48:48 +02:00
yuhan0
5b2e969b3b [git] Defer orgit package 2018-12-04 22:07:41 -05:00
emacspace
45276bd96f documentation formatting: Wed Dec 5 03:03:03 UTC 2018 2018-12-04 22:06:14 -05:00
emacspace
4912b54f24 documentation formatting: Mon Nov 12 22:12:39 UTC 2018 2018-11-12 22:24:27 +00:00
yuhan0
0596e90c3d Add 'z' recenter bindings for various transient states
By analogy with the "zz", "zb", "zt" vim / evil bindings, this adds an
additional key binding "z" for `recenter-top-bottom` to the following
transient states which navigate around the buffer in large jumps:
- auto-symbol-highlight
- error
- buffer
- vcs
- org-babel

This allows for repositioning of the buffer for visibility without having to
exit the transient state.

Minor updates are also made to documentation of other transient states.
2018-11-12 21:47:17 +00:00
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
emacspace
901f35849a documentation fixes: Tue Oct 23 14:18:21 UTC 2018 2018-10-23 23:38:16 +03:00
JAremko
cd39f80c24 Reformat documentation 2018-10-11 00:13:43 +03: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
Miciah Masters
4408788799 github: Disable status, issues, and PRs by default
Try again to fix issue #11176.

* layers/+source-control/github/packages.el (github/init-magithub): Disable
the GitHub project status, pull requests, and issues sections by default.
* layers/+source-control/github/README.org: Document that these sections
are all disabled by default, and how to enable them.
2018-08-18 15:06:26 -04:00
Miciah Masters
6659088dc5 github: Make Magithub offline by default
Fix issue #11176.

* layers/+source-control/github/packages.el (github/init-magithub):
Configure Magithub to be offline by default.
* layers/+source-control/github/README.org: Add documentation about
Magithub's offline mode.
2018-08-18 13:22:37 +01:00
Miciah Masters
2148562982 Fix loading of Magithub
Fix issue #10760: Magithub sections are not added to Magit.

The problem is that the Spacemacs init function's use-package form for
Magithub specifies both :after magit and :defer t. It should specify only
the former so that Magithub will be loaded when Magit is loaded.

* layers/+source-control/github/packages.el (github/init-magithub): Delete
:defer argument.
2018-08-01 23:03:19 -04:00
JAremko
6fef4b7481 Fix git-timemachine link 2018-07-20 02:45:50 +03:00
Ruslan Kamashev
ecc7eeda74 Add gitignore-templates 2018-07-03 23:48:50 +03:00
syl20bnr
666671a881 Sort key bindings alphabetically in version-control README.org 2018-06-24 02:54:07 -04:00
Masayuki Takemura
ce6e28601f diff-mode: define key bindings with leader key for vim editing style
This patch defines key bindings with leader key instead of evilified state to
make it easier for people those who edit in vim style to use diff-mode for both
of editing and reviewing files/buffers.

There are two use cases for diff-mode:

(1) to manually edit diff in a patch file
(2) to review diff that is generated by `vc-diff' or similar commands

The evilified state is useful for the case (2), but is confusing for the
case (1). Usually, users of vim editing style expect that they are in normal
state when a new buffer is created. However, when evilified state is used for
the case (1), some keys insert their character in a buffer, which let the users
think they are in insert state and keep hitting keys to edit the buffer, while
other keys invoke commands or change contents of buffer, which let them think
they are in normal state, so finally the user get lost what state they are in if
they don't know evilified state is used for diff-mode.

The changeset 58d521af5 "Unbreak diff-mode", originally written on Apr 2 2017,
tried to avoid the confusion by removing the evilified state configuration.
However, it is overwritten by the other and older changeset 8009e1bf5 "evilify
vc-* buffers", which is written on Feb 22 2016, for some reason.

This patch respects both of the use cases listed above, thus defines key
bindings with leader key instead of just removing the evilified state
configuration.
2018-06-24 02:54:07 -04:00
syl20bnr
acfc8c5814 version-control: correctly defer diff-hl and git-gutter packages 2018-06-14 10:08:38 -04:00
syl20bnr
31324f68bb Avoid loading all the diff packages in version-control layer 2018-06-14 02:51:24 -04:00
syl20bnr
c3c7249234 Delay diff-hl loading by 5 seconds 2018-06-14 02:28:10 -04:00
syl20bnr
c41a122b24 Lazy load diff-hl 2018-06-10 23:30:48 -04:00
syl20bnr
b282e553ba Use dotspacemacs backward compatibility macro instead of aliases 2018-06-08 02:24:38 -04:00
Codruț Constantin Gușoi
e1ae3448e6 Remove whitespace from readme 2018-05-27 22:54:25 +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