sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

rename merging context to mergeConflicts

Browse Source
This commit is contained in:
Jesse Duffield
2022-08-06 18:05:00 +10:00
parent cd2c01d1cf
commit 445a625b56
16 changed files with 215 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/context/context.go
View File

@ -23,7 +23,7 @@ const (
STAGING_SECONDARY_CONTEXT_KEY types.ContextKey = "stagingSecondary"
PATCH_BUILDING_MAIN_CONTEXT_KEY types.ContextKey = "patchBuilding"
PATCH_BUILDING_SECONDARY_CONTEXT_KEY types.ContextKey = "patchBuildingSecondary"
MERGING_MAIN_CONTEXT_KEY types.ContextKey = "merging"
MERGE_CONFLICTS_CONTEXT_KEY types.ContextKey = "mergeConflicts"
// these shouldn't really be needed for anything but I'm giving them unique keys nonetheless
OPTIONS_CONTEXT_KEY types.ContextKey = "options"
@ -60,7 +60,7 @@ var AllContextKeys = []types.ContextKey{
STAGING_SECONDARY_CONTEXT_KEY,
PATCH_BUILDING_MAIN_CONTEXT_KEY,
PATCH_BUILDING_SECONDARY_CONTEXT_KEY,
MERGING_MAIN_CONTEXT_KEY,
MERGE_CONFLICTS_CONTEXT_KEY,
MENU_CONTEXT_KEY,
CONFIRMATION_CONTEXT_KEY,
@ -93,7 +93,7 @@ type ContextTree struct {
StagingSecondary *PatchExplorerContext
CustomPatchBuilder *PatchExplorerContext
CustomPatchBuilderSecondary types.Context
Merging types.Context
MergeConflicts *MergeConflictsContext
Confirmation types.Context
CommitMessage types.Context
CommandLog types.Context
@ -127,7 +127,7 @@ func (self *ContextTree) Flatten() []types.Context {
self.Confirmation,
self.CommitMessage,
self.Merging,
self.MergeConflicts,
self.StagingSecondary,
self.Staging,
self.CustomPatchBuilderSecondary,