1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-10 11:10:18 +02:00
lazygit/pkg/gui/controllers/helpers
Jesse Duffield b61ca21a84 Allow checking for merge conflicts after running a custom command
We have a use-case to rebind 'm' to the merge action in the branches panel. There's three ways to handle this:
1) For all global keybindings, define a per-panel key that invokes it
2) Give a name to all controller actions and allow them to be invoked in custom commands
3) Allow checking for merge conflicts after running a custom command so that users can add their own 'git merge' custom command
that matches the in-built action

Option 1 is hairy, Option 2 though good for users introduces new backwards compatibility issues that I don't want to do
right now, and option 3 is trivially easy to implement so that's what I'm doing.

I've put this under an 'after' key so that we can add more things later. I'm imagining other things like being able to
move the cursor to a newly added item etc.

I considered always running this hook by default but I'd rather not: it's matching on the output text and I'd rather something
like that be explicitly opted-into to avoid cases where we erroneously believe that there are conflicts.
2023-07-13 18:40:34 +10:00
..
amend_helper.go standardise helper args 2023-04-30 13:19:53 +10:00
app_status_helper.go Use an interface for tasks instead of a concrete struct 2023-07-10 17:12:21 +10:00
bisect_helper.go split context common from helper common 2023-04-30 13:19:53 +10:00
cherry_pick_helper.go Use an interface for tasks instead of a concrete struct 2023-07-10 17:12:21 +10:00
commits_helper.go Retain commit message when cycling history 2023-04-30 13:19:54 +10:00
confirmation_helper.go Introduce filtered list view model 2023-07-03 12:54:13 +10:00
credentials_helper.go Handle pending actions properly in git commands that require credentials 2023-07-08 22:54:52 +10:00
diff_helper.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
files_helper.go standardise helper args 2023-04-30 13:19:53 +10:00
gpg_helper.go Use an interface for tasks instead of a concrete struct 2023-07-10 17:12:21 +10:00
helpers.go Introduce filtered list view model 2023-07-03 12:54:13 +10:00
host_helper.go standardise helper args 2023-04-30 13:19:53 +10:00
merge_and_rebase_helper.go Allow checking for merge conflicts after running a custom command 2023-07-13 18:40:34 +10:00
merge_conflicts_helper.go Fix race condition 2023-05-16 21:01:38 +10:00
mode_helper.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
patch_building_helper.go Disregard the "ignore whitespace" option in the patch building panel 2023-05-19 18:22:28 +02:00
record_directory_helper.go split context common from helper common 2023-04-30 13:19:53 +10:00
refresh_helper.go Use an interface for tasks instead of a concrete struct 2023-07-10 17:12:21 +10:00
refs_helper.go Replace uses of "git stash save" with "git stash push" 2023-07-10 15:09:17 +02:00
repos_helper.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
search_helper.go Add integration tests for searching/filtering 2023-07-03 12:54:14 +10:00
snake_helper.go split context common from helper common 2023-04-30 13:19:53 +10:00
staging_helper.go Refresh staging panel when committing 2023-04-30 13:19:54 +10:00
suggestions_helper.go Use an interface for tasks instead of a concrete struct 2023-07-10 17:12:21 +10:00
tags_helper.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
update_helper.go Use an interface for tasks instead of a concrete struct 2023-07-10 17:12:21 +10:00
upstream_helper_test.go Add option to (un)set upstream for a local branch 2022-04-11 14:04:06 +02:00
upstream_helper.go standardise helper args 2023-04-30 13:19:53 +10:00
view_helper.go standardise helper args 2023-04-30 13:19:53 +10:00
window_arrangement_helper.go Introduce filtered list view model 2023-07-03 12:54:13 +10:00
window_helper.go move side window actions to controllers package 2023-04-30 13:19:53 +10:00
working_tree_helper.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00