utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-12 00:26:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
jesseduffield.lazygit/pkg/gui
History
Jesse Duffield a82134f41c Fix race condition 
Our refresh code may try to push a context. It does this in two places:
1) when all merge conflicts are resolved, we push a 'continue merge?' confirmation context
2) when all conflicts of a given file are resolved and we're in the merge conflicts context,
   we push the files context.

Sometimes we push the confirmation context and then push the files context over it, so the user
never sees the confirmation context.

This commit fixes the race condition by adding a check to ensure that we're still in the
merge conflicts panel before we try escaping from it
2023-05-16 21:01:38 +10:00
..
constants move window arrangement helper 2023-04-30 13:19:53 +10:00
context Split commit message panel into commit summary and commit description panel 2023-04-30 13:19:53 +10:00
controllers Fix race condition 2023-05-16 21:01:38 +10:00
filetree fix could-not-access error 2022-11-12 18:09:15 -03:30
keybindings Make arrows consistent (#2501) 2023-03-18 11:32:44 +11:00
mergeconflicts migrate patch building tests 2023-02-25 21:37:16 +11:00
modes refactor cherry pick code to move state access out of helper 2023-04-30 13:19:53 +10:00
patch_exploring refactor patch code 2023-03-19 16:30:39 +11:00
popup lots of changes 2023-04-30 13:19:53 +10:00
presentation merge master into refactor-better-encapsulation 2023-05-02 19:05:42 +10:00
services/custom_commands appease linter 2023-04-30 13:19:53 +10:00
status lots of changes 2023-04-30 13:19:53 +10:00
style fix: fix default color to be white 2023-02-03 23:36:59 +09:00
types merge master into refactor-better-encapsulation 2023-05-02 19:05:42 +10:00
background.go Begin refactoring gui 2023-04-30 13:19:52 +10:00
command_log_panel.go Rename CmdLog -> GuiLog 2023-05-16 21:01:38 +10:00
context.go Don't deactivate context that you're about to activate 2023-05-16 21:01:38 +10:00
context_config.go move some methods 2023-04-30 13:19:53 +10:00
controllers.go Split commit message panel into commit summary and commit description panel 2023-04-30 13:19:53 +10:00
dummies.go feat: add GitVersion struct 2022-12-30 20:01:14 +09:00
editors.go Split commit message panel into commit summary and commit description panel 2023-04-30 13:19:53 +10:00
extras_panel.go lots of changes 2023-04-30 13:19:53 +10:00
file_watching.go Begin refactoring gui 2023-04-30 13:19:52 +10:00
global_handlers.go move more actions into controller 2023-04-30 13:19:53 +10:00
gui.go Rename CmdLog -> GuiLog 2023-05-16 21:01:38 +10:00
gui_common.go remove duplicate method 2023-05-11 19:00:41 +10:00
gui_driver.go Rename CmdLog -> GuiLog 2023-05-16 21:01:38 +10:00
information_panel.go lots of changes 2023-04-30 13:19:53 +10:00
keybindings.go ensure initial context is set when entering submodule 2023-04-30 13:19:53 +10:00
layout.go Allow the selected line of a list view to be outside the visible area 2023-05-11 13:23:58 +02:00
main_panels.go appease linter 2023-04-30 13:19:53 +10:00
menu_panel.go lots more refactoring 2023-04-30 13:19:53 +10:00
options_map.go split context common from helper common 2023-04-30 13:19:53 +10:00
pty.go Make sure scrollbars have the right size initially 2023-03-21 18:26:18 +01:00
pty_windows.go Format code to pass lint 2021-09-16 21:38:43 +08:00
recent_repos_panel.go Begin refactoring gui 2023-04-30 13:19:52 +10:00
searching.go Begin refactoring gui 2023-04-30 13:19:52 +10:00
tasks_adapter.go Begin refactoring gui 2023-04-30 13:19:52 +10:00
test_mode.go remove old integration test recording code 2023-03-24 18:42:11 +11:00
view_helpers.go lots more refactoring 2023-04-30 13:19:53 +10:00
views.go Split commit message panel into commit summary and commit description panel 2023-04-30 13:19:53 +10:00