Jesse Duffield
0accb07dcc
Merge pull request #2591 from screendriver/nvim
2023-05-04 16:55:22 +10:00
Jesse Duffield
3cac14c76e
add comment to encourage keeping code and docs in sync
2023-05-04 16:53:13 +10:00
Christian Rackerseder
1636931c2b
Include "kakoune" in supported edit presets
2023-05-04 08:28:58 +02:00
Christian Rackerseder
6e027f42da
Include "nvim" in supported edit presets
2023-05-03 13:30:51 +02:00
Jesse Duffield
5149b24ab3
Merge pull request #2585 from stefanhaller/only-use-empty-arg-when-available
2023-05-03 17:59:07 +10:00
Jesse Duffield
c520c5cfc3
Merge pull request #2588 from jesseduffield/update-open-docs
2023-05-03 13:48:50 +10:00
Jesse Duffield
c88ecdf87c
update open docs
2023-05-03 13:48:04 +10:00
Stefan Haller
d607b366cb
Add own version for test move_to_earlier_commit for older git versions
2023-05-02 16:27:32 +02:00
Stefan Haller
c8f26aca68
Rename From to AtLeast
2023-05-02 16:27:32 +02:00
Ryooooooga
30656b5ac6
chore(git_commands): support old git version (git rebase --empty=keep)
2023-05-02 16:27:32 +02:00
Jesse Duffield
5dacbb6293
merge master into refactor-better-encapsulation
2023-05-02 19:05:42 +10:00
README-bot
88d4313970
Updated README.md
2023-05-02 08:59:25 +00:00
Jesse Duffield
4160fa518c
Merge pull request #2582 from stefanhaller/config-for-showing-branch-heads
2023-05-02 18:59:12 +10:00
Stefan Haller
fba1a2b5ac
Add config gui.experimentalShowBranchHeads
...
People find the new (*) display for branch heads in the commits list confusing,
so make it opt-in for now.
2023-05-02 18:58:54 +10:00
Jesse Duffield
c6c4346d48
Merge pull request #2551 from stefanhaller/fix-initial-context-activation
2023-05-01 21:22:43 +10:00
Jesse Duffield
ee9ae8f07f
Merge pull request #2552 from stefanhaller/support-stacked-branches
2023-05-01 21:07:19 +10:00
Jesse Duffield
8d68ab41b6
Merge branch 'refactor-better-encapsulation' into test-refactor
2023-04-30 14:02:16 +10:00
Jesse Duffield
af97bf484c
Refresh staging panel when committing
...
We now refresh the staging panel when doing an unscoped refresh, so that if we commit from the staging panel we escape
back to the files panel if need be. But that causes flickering when doing an unscoped refresh from other contexts,
because the refreshStagingPanel function assumes that the staging panel has focus. So we're adding a guard at the top
of that function to early exit if we don't have focus.
2023-04-30 13:19:54 +10:00
Jesse Duffield
a57310df24
Retain commit message when cycling history
...
When cycling history, we want to make it so that upon returning to the original prompt, you get your text back.
Importantly, we don't want to use the existing preservedMessage field for that because that's only for preserving
a NEW commit message, and we don't want the history stuff of the commit reword flow to overwrite that.
2023-04-30 13:19:54 +10:00
Sean
9d68b287db
Split commit message panel into commit summary and commit description panel
...
When we use the one panel for the entire commit message, its tricky to have a keybinding both for adding a newline and submitting.
By having two panels: one for the summary line and one for the description, we allow for 'enter' to submit the message when done from the summary panel,
and 'enter' to add a newline when done from the description panel. Alt-enter, for those who can use that key combo, also works for submitting the message
from the description panel. For those who can't use that key combo, and don't want to remap the keybinding, they can hit tab to go back to the summary panel
and then 'enter' to submit the message.
We have some awkwardness in that both contexts (i.e. panels) need to appear and disappear in tandem and we don't have a great way of handling that concept,
so we just push both contexts one after the other, and likewise remove both contexts when we escape.
2023-04-30 13:19:53 +10:00
Jesse Duffield
a5c72d056d
ensure initial context is set when entering submodule
2023-04-30 13:19:53 +10:00
Jesse Duffield
8a86de85c8
remove log call because it clutters test output
2023-04-30 13:19:53 +10:00
Jesse Duffield
dd31f8ecea
update cheatsheets
2023-04-30 13:19:53 +10:00
Jesse Duffield
5a7b2ab6d0
fix rendering of commit files view
2023-04-30 13:19:53 +10:00
Jesse Duffield
68a9d7fd77
appease linter
2023-04-30 13:19:53 +10:00
Jesse Duffield
19cbafcdfc
remove unused file
2023-04-30 13:19:53 +10:00
Jesse Duffield
f2c85c5b19
move side window actions to controllers package
2023-04-30 13:19:53 +10:00
Jesse Duffield
0faa41e6f8
move toggle whitespace action to controllers package
2023-04-30 13:19:53 +10:00
Jesse Duffield
2e32e55957
update integration test for toggling whitespace
2023-04-30 13:19:53 +10:00
Jesse Duffield
037cd99138
move quit actions to controller
2023-04-30 13:19:53 +10:00
Jesse Duffield
6388885699
fix reflog text colour by defaulting every view to the same foreground colour
2023-04-30 13:19:53 +10:00
Jesse Duffield
d3e9bc2185
remove unused file
2023-04-30 13:19:53 +10:00
Jesse Duffield
ea4587a3b8
move some methods
2023-04-30 13:19:53 +10:00
Jesse Duffield
2da300f2fb
move diffing menu action to controller
2023-04-30 13:19:53 +10:00
Jesse Duffield
7848958326
move filtering menu action to controller
2023-04-30 13:19:53 +10:00
Jesse Duffield
2cba98e3fe
move another action into controller
2023-04-30 13:19:53 +10:00
Jesse Duffield
f8c9ce33c2
move more actions into controller
2023-04-30 13:19:53 +10:00
Jesse Duffield
71753770ad
move custom patch options menu action to controllers package
2023-04-30 13:19:53 +10:00
Jesse Duffield
820b1e811d
move custom command action into its own file
2023-04-30 13:19:53 +10:00
Jesse Duffield
4a33fede7b
move window arrangement helper
2023-04-30 13:19:53 +10:00
Jesse Duffield
db12853bbe
lots of changes
2023-04-30 13:19:53 +10:00
Jesse Duffield
711674f6cd
standardise controller helper methods
2023-04-30 13:19:53 +10:00
Jesse Duffield
fc91ef6a59
standardise helper args
2023-04-30 13:19:53 +10:00
Jesse Duffield
43251e7275
split context common from helper common
2023-04-30 13:19:53 +10:00
Jesse Duffield
f081358943
move getDisplayStrings funcs into contexts
2023-04-30 13:19:53 +10:00
Jesse Duffield
0c6ab4b43e
refactor cherry pick code to move state access out of helper
2023-04-30 13:19:53 +10:00
Jesse Duffield
1b2fb34ffd
start moving getDisplayStrings funcs into contexts
2023-04-30 13:19:53 +10:00
Jesse Duffield
0e5a4c7a36
move getModel functions into contexts
2023-04-30 13:19:53 +10:00
Jesse Duffield
47b91f1ef5
move views into contexts
2023-04-30 13:19:53 +10:00
Jesse Duffield
e2db6a1732
remove context callback opts
2023-04-30 13:19:53 +10:00
