Commit graph

277 commits

Author SHA1 Message Date
Henrik Lissner
99eea1d3e2
Merge pull request #3420 from yyadavalli/patch-1
Add gitflow and move worktree in magit dispatch
2020-06-21 13:53:58 -04:00
Henrik Lissner
042cc781b7
Bump :tools magit
magit/magit@793e387 -> magit/magit@0746bf1
magit/forge@6f299d2 -> magit/forge@048efbb
2020-06-20 03:02:05 -04:00
Yash Yadavalli
e1118f4754
Add gitflow as %, moving worktree to *
- Adds `magit-gitflow-popup` as `%` keybinding in the `magit-dispatch`, mirroring the keybinding in `magit-mode-map`.
- The existing binding `magit-worktree` is moved to `*`
2020-06-19 21:14:37 +00:00
t-e-r-m
41d5be12a0 Gravatars now opt-in. Magit README updated. 2020-06-19 00:36:30 +05:30
Henrik Lissner
73dcb13463
Bump :tools magit
magit/magit@ae82fcf -> magit/magit@793e387
emacs-evil/evil-magit@253c644 -> emacs-evil/evil-magit@88dc26c
2020-06-10 02:44:27 -04:00
Étienne BERSAC
ca4ed2c5fa
magit: Enable goto-address-mode in process buffer
This way, URL returned by remote are clicable.
2020-06-04 14:07:51 +02:00
Henrik Lissner
fdf9c408e8
Bump :tools
Silex/docker.el@0874520 -> Silex/docker.el@d6233bd
editorconfig/editorconfig-emacs@19de0ec -> editorconfig/editorconfig-emacs@9a73ff7
emacs-lsp/dap-mode@8f69dc2 -> emacs-lsp/dap-mode@7ad9157
emacs-lsp/lsp-mode@81d62d5 -> emacs-lsp/lsp-mode@d5f0410
emacs-lsp/lsp-ui@271b47c -> emacs-lsp/lsp-ui@c3e7a37
emacsorphanage/quickrun@2e37ce9 -> emacsorphanage/quickrun@c6ce1f3
gilbertw1/dash-docs@111fd9b -> gilbertw1/dash-docs@dafc8fc
jacktasia/dumb-jump@d760aa8 -> jacktasia/dumb-jump@d86f59c
joaotavora/eglot@d99a447 -> joaotavora/eglot@ac9239b
magit/forge@09bf8ad -> magit/forge@6f299d2
magit/magit@b1b2683 -> magit/magit@ae82fcf
millejoh/emacs-ipython-notebook@42134ad -> millejoh/emacs-ipython-notebook@ee31cdb
paradoxxxzero/jinja2-mode@cfaa7bb -> paradoxxxzero/jinja2-mode@4540f99
tkf/emacs-request@216d570 -> tkf/emacs-request@912525c
tumashu/posframe@093b29a -> tumashu/posframe@6285217
wbolster/emacs-direnv@1daf479 -> wbolster/emacs-direnv@f5484b0
yoshiki/yaml-mode@cecf4b1 -> yoshiki/yaml-mode@34648f2
2020-06-02 19:52:42 -04:00
Henrik Lissner
830e1289aa
Bind SPC g G -> magit-status-here
And recenter after invoking it.
2020-05-24 16:32:19 -04:00
Henrik Lissner
93d188e6bc
Resolve magit-git-executable to absolute path
For minor performance gain for macOS/Windows users. Shouldn't make a
difference on Linux.
2020-05-21 01:31:51 -04:00
Henrik Lissner
885197bd06
Fix "Cannot determine magit's version" logs on Windows
Magit complains loudly (but harmlessly) when it can't determine its own
version in a sparse clone. This was fixed upstream in
magit/magit@b1b2683 for unix OSes, but not for Windows where symlinks
aren't supported, and so `magit-version` can't resolve its own repo's
root (see raxod502/straight.el#520).
2020-05-20 16:08:52 -04:00
Henrik Lissner
94fc6f714f
Bump :tools magit
magit/magit@d27d6e4 -> magit/magit@b1b2683
magit/forge@e2da806 -> magit/forge@09bf8ad

We no longer need the magit version hack, thanks to magit/magit@b1b2683
2020-05-20 01:10:15 -04:00
Henrik Lissner
ea18c83c0a
General refactors & reformatting across the board 2020-05-15 01:44:53 -04:00
Henrik Lissner
40c185bd70
Bump :tools
Silex/docker.el@a2092b3 -> Silex/docker.el@0874520
emacs-lsp/dap-mode@0b9c8f2 -> emacs-lsp/dap-mode@804e364
emacs-lsp/helm-lsp@db24399 -> emacs-lsp/helm-lsp@6b5ce18
emacs-lsp/lsp-mode@4898d35 -> emacs-lsp/lsp-mode@87ea1df
emacs-straight/rainbow-mode@3ef813d -> emacs-straight/rainbow-mode@f780ddb
emacsorphanage/quickrun@50e07e7 -> emacsorphanage/quickrun@2e37ce9
magit/magit@8de6ecf -> magit/magit@d27d6e4
maxchaos/emacs-powerthesaurus@81a262e -> maxchaos/emacs-powerthesaurus@4a83478
millejoh/emacs-ipython-notebook@1322d8c -> millejoh/emacs-ipython-notebook@42134ad
politza/pdf-tools@0159cb1 -> politza/pdf-tools@d971298
realgud/realgud@b854e04 -> realgud/realgud@e03446f
tumashu/posframe@e62e584 -> tumashu/posframe@093b29a
zx2c4/password-store@88936b1 -> zx2c4/password-store@07b169e

We're also transitioning from abbreviated SHA1 hashes to full ones. See
45cdfb125 for why.
2020-04-30 01:27:58 -04:00
Henrik Lissner
217a032035
Bump :tools magit
magit/magit@0f1234e -> magit/magit@8de6ecf
magit/forge@2e2d26c -> magit/forge@e2da806
2020-04-25 21:52:10 -04:00
Henrik Lissner
916ef0fbbe
Rename unmap! to undefine-key!
unmap! gives the false impression that it is related or similar to map!,
but it isn't.
2020-04-23 23:56:17 -04:00
Henrik Lissner
fe3f3d91c3
tools/magit: gate forge behind flag & add README #1166 2020-04-23 23:56:17 -04:00
Henrik Lissner
31a31fff46
Bump :tools magit
emacs-evil/evil-magit@0b79aa3 -> emacs-evil/evil-magit@253c644
magit/magit@68b5a13 -> magit/magit@0f1234e
2020-04-14 19:18:49 -04:00
Henrik Lissner
3622e36c75
Fix 'buffer does not seem to be associated with any file' error
Fixes #2869
Closes #2870
2020-04-10 13:47:41 -04:00
Henrik Lissner
b78fc4eb76
Minor refactor & reformatting across the board 2020-04-08 15:30:10 -04:00
Henrik Lissner
2ceac53421
Prevent scrolling on magit refresh & toc-org 2020-04-04 01:27:41 -04:00
Henrik Lissner
566a5c8a32
Bump :tools
krzysztof-magosa/company-ansible@8d1ffbc -> krzysztof-magosa/company-ansible@79dd421
realgud/realgud@2cca776 -> realgud/realgud@94f2835
emacs-lsp/dap-mode@d10e254 -> emacs-lsp/dap-mode@e2086fc
wbolster/emacs-direnv@1f93e3f -> wbolster/emacs-direnv@1daf479
Silex/docker.el@baba7f7 -> Silex/docker.el@a2092b3
editorconfig/editorconfig-emacs@5c67d22 -> editorconfig/editorconfig-emacs@19de0ec
millejoh/emacs-ipython-notebook@b265205 -> millejoh/emacs-ipython-notebook@57e84c6
syohex/emacs-quickrun@55bbe5d -> syohex/emacs-quickrun@50e07e7
jacktasia/dumb-jump@b5185e3 -> jacktasia/dumb-jump@e8e9b0c
magit/magit@55c5c7c -> magit/magit@68b5a13
magit/forge@c2fbce6 -> magit/forge@2e2d26c
alphapapa/magit-todos@ad5663a -> alphapapa/magit-todos@a0e5d1f
charignon/github-review@3fb7cc2 -> charignon/github-review@50c6bcc
syohex/emacs-terraform-mode@6973d1a -> syohex/emacs-terraform-mode@2967e7b
2020-03-27 16:47:11 -04:00
Henrik Lissner
93521ba5be
Prevent "version control data is outdated" prompt
The prompt was too intrusive, so update vc state if buffer is modified
instead.
2020-03-14 22:04:49 -04:00
Henrik Lissner
cb4f9b86c6
Bump :tools magit
magit/magit@c8cd22e -> magit/magit@55c5c7c
magit/forge@0ade907 -> magit/forge@c2fbce6
charignon/github-review@1de2d6d -> charignon/github-review@3fb7cc2
2020-03-06 16:37:57 -05:00
Henrik Lissner
260148f4e9
Bump :tools magit
magit/magit@8cb6cdf -> magit/magit@c8cd22e
magit/forge@fb04716 -> magit/forge@0ade907
emacs-evil/evil-magit@1bfd546 -> emacs-evil/evil-magit@0b79aa3

Fixes #2446
2020-03-02 12:02:49 -05:00
Henrik Lissner
0a9b06ac16
Prevent magit trying to revert non-existent file buffers 2020-02-25 20:23:04 -05:00
Henrik Lissner
5ed8c1db76
Bump :tools magit
magit/magit@57f2d0f -> magit/magit@8cb6cdf
magit/forge@0081afd -> magit/forge@fb04716
2020-02-24 20:49:03 -05:00
Henrik Lissner
2f696ff5c5
Temp fix #2446: yy in magit when evil-want-Y-yank-or-eol 2020-02-24 20:35:59 -05:00
Henrik Lissner
24282a454e
Fix revert-buffer--default error after using magit
It too aggressively tries to revert all buffers, even ones that can't be
reverted.
2020-02-24 19:30:35 -05:00
Henrik Lissner
731e1c503d
Lazily revert affected buffers after magit 2020-02-21 13:40:52 -05:00
Henrik Lissner
c13e7fe7fc
Bump magit, forge, magit-todos & evil-magit
magit/magit@2bdfc4a -> magit/magit@57f2d0f
magit/forge@2833783 -> magit/forge@0081afd
emacs-evil/evil-magit@7223dca -> evil-magit/evil-magit@1bfd546
alphapapa/magit-todos@a64e365 -> alphapapa/magit-todos@ad5663a
2020-02-09 20:40:25 -05:00
Henrik Lissner
a9402cfb55
Fix #2373: bring back package pinning
This needs some serious refactoring...
2020-01-25 19:02:00 -05:00
Henrik Lissner
3ebdc513f8
Revert 24d804da7 #2415
It was fixed upstream in magit/magit@6bfe8c0
2020-01-24 05:16:09 -05:00
Henrik Lissner
24d804da79
Fix #2415: install magit-section 2020-01-23 17:12:46 -05:00
Henrik Lissner
4cc14389e8
PIN ALL THE PACKAGES 2020-01-14 22:32:11 -05:00
Henrik Lissner
e6638b82a1
Autoload forge-create-{pullreq,issue} 2020-01-04 15:42:04 -05:00
Henrik Lissner
48cd3e0ad0
tools/magit: prevent 'cannot determine magit's version' warnings
By ensuring the advice runs twice.
2019-12-15 23:43:33 -05:00
Alan Brown
ec08acba1e Changed to correct default location
https://git-scm.com/docs/git-credential-cache
2019-12-09 11:45:57 +00:00
Edmund Miller
89f4f9d88f
fix(magit): add bindings for github-review 2019-12-08 13:35:18 -06:00
Edmund Miller
617e46152f
add github-review 2019-12-08 13:34:34 -06:00
Henrik Lissner
44e22b7f80
tools/magit: replace +magit/clone w/ magit-clone
The former no longer works, since ghub's API has changed. Meanwhile, the
magit-clone command has grown in features to match (and surpass)
+magit/clone, so we'll just use that instead.
2019-11-23 01:21:25 -05:00
Henrik Lissner
5e6363f025
tools/magit: invalidate projectile cache on git checkout 2019-10-29 11:36:46 -04:00
Henrik Lissner
54559d567a
tools/magit: hide modeline in magit-popups
Since magit-gitflow still uses the old magit-popups, rather than
transient.
2019-10-25 02:38:15 -04:00
Henrik Lissner
e0469e14c0
Minor refactors & reformatting across the board 2019-10-20 19:57:27 -04:00
Henrik Lissner
7f0ca974e9
tools/magit: free up 0-4 keys for evil & bind g=
- Replaces 0 with g= (magit-diff-default-context)
- Unbinds 1-4 keys so you can use numbered motions in magit buffers
  again
2019-10-20 10:58:52 -04:00
Henrik Lissner
8407af98fd
tools/magit: disable magit-todos by default
This plugin is a source of slowness and occasional bugs. Instead of
enabling it by default, we keep it around for magit-todos-list, which
could replace +ivy/tasks.
2019-10-17 02:53:44 -04:00
Henrik Lissner
19bfb1285d
Fix #1852: magit not restoring wconf when quitting 2019-10-03 16:43:49 -04:00
Henrik Lissner
0e6c015d60
tools/magit: init forge after building emacsql 2019-10-03 11:42:22 -04:00
Henrik Lissner
bad0dba1fc
tools/magit: refactor magit-version advice
Not strictly necessary, but more correct.
2019-09-20 17:18:16 -04:00
Henrik Lissner
2d365619cd
General refactor & cleanup, across the board 2019-09-13 22:00:34 -04:00
Henrik Lissner
70c60e6583
tools/magit: re-enable magit-todos over tramp
Reverts 9ab49be. TRAMP support was added in
alphapapa/magit-todos@a80dace
2019-09-07 19:57:58 -04:00