Commit graph

101 commits

Author SHA1 Message Date
Hong Xu
e37b70cfa3 Bound counsel-git to gff and move magit-find-file to gfF.
counsel-git find a file in the current git repository. "gff" is
currently bound to magit-find-file. While counsel-git seemingly performs the
same functionality as magit-find-file, they are substantially different:
magit-find-file is not intended to find a file, contrary to what the
name indicates. See https://github.com/magit/magit/issues/3967 for
explanation. This is why we need another key binding for counsel-git.
2019-10-16 22:03:42 +02:00
Miciah Masters
8d6f736209 Delete old git-link and git-timemachine code
Delete integration code for git-link and git-timemachine, which is
superseded by upstream changes to git-link committed in August 2016:
433ba1dba7

* CHANGELOG.develop: Add an entry for this change.
* layers/+source-control/git/funcs.el (spacemacs/git-link-copy-url-only):
Replace call to spacemacs/git-link with a call to git-link.
(spacemacs/git-link-commit-copy-url-only): Replace call to
spacemacs/git-link-commit with a call to git-link-commit.
(spacemacs/git-link, spacemacs/git-link-commit): Delete functions.
* layers/+source-control/git/packages.el (git/init-git-link): Replace
binding to spacemacs/git-link with a binding to git-link.
2019-10-14 18:18:49 +02:00
Roman Gonzalez
28f3b6289d Add spacemacs/git-permalink functionality
Context:

When using org files, one normally tends to add Github code links to an
algorithm/bug explanation so that readers are able to follow along with a PR
change.

The current `<SPC> g l L` command gets us the URL to the current branch; given
the code is in flux, the link becomes non-sensical rather quickly, loosing value
when trying to build a document with explanations about the code.

This PR allows us to get the Permalink (e.g. link associated to the commit, not
the branch); using this, the URL contents will never change with new commits
submitted to the repository.

Changes:

  * Add two new functions with associated keybindings:

    - `<SPC> g l p` maps to `spacemacs/git-permalink`

    - `<SPC> g l P` maps to `spacemacs/git-permalink-copy-url-only`

  * The above changes rely on mechanisms of `git-link`, so no new code needs to
    be introduced
2019-10-05 19:19:41 +02:00
Compro-Prasad
42296a91df [org] Fix commit browsing via magit blame in org buffers 2019-09-22 19:21:53 +02:00
yuhan0
56ef7f5163 Add "accept", "cancel" leader key bindings to magit log mode 2019-04-21 21:55:51 +02:00
duianto
d9b7ac64f3 Hide mode-line indicators: emoji and WE
emoji appeared in at least org mode.
WE appeared in the COMMIT_EDITMSG buffer.
2019-04-21 13:33:24 +02:00
duianto
76ba46893b Remove magit-log-arguments variable assignment
Magit removed the variable: magit-log-arguments
4641aa07e0
2019-04-18 10:14:14 +02:00
duianto
f8d40a455c [git] Code formatting
Fix missing newline warning
Keep lines under 80 chars
2019-04-11 14:17:02 +02:00
yuhan0
cc094c85d2 Move purpose-x config to spacemacs-purpose layer
This would otherwise cause a void-function error for users of the spacemacs-base
distribution without window-purpose installed.
2019-04-07 18:07:57 +02:00
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
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
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
yuhan0
5b2e969b3b [git] Defer orgit package 2018-12-04 22:07:41 -05: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
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