sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

rename key to Pull

Browse Source
This commit is contained in:
Jesse Duffield
2023-02-19 11:42:00 +11:00
parent 979c3d6278
commit bff076c70a
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/config/user_config.go
View File

@ -178,8 +178,8 @@ type KeybindingUniversalConfig struct {
ScrollDownMainAlt2 string `yaml:"scrollDownMain-alt2"` ScrollDownMainAlt2 string `yaml:"scrollDownMain-alt2"`
ExecuteCustomCommand string `yaml:"executeCustomCommand"` ExecuteCustomCommand string `yaml:"executeCustomCommand"`
CreateRebaseOptionsMenu string `yaml:"createRebaseOptionsMenu"` CreateRebaseOptionsMenu string `yaml:"createRebaseOptionsMenu"`
PushFiles string `yaml:"pushFiles"` Push string `yaml:"pushFiles"` // 'Files' appended for legacy reasons
PullFiles string `yaml:"pullFiles"` Pull string `yaml:"pullFiles"` // 'Files' appended for legacy reasons
Refresh string `yaml:"refresh"` Refresh string `yaml:"refresh"`
CreatePatchOptionsMenu string `yaml:"createPatchOptionsMenu"` CreatePatchOptionsMenu string `yaml:"createPatchOptionsMenu"`
NextTab string `yaml:"nextTab"` NextTab string `yaml:"nextTab"`
@ -468,8 +468,8 @@ func GetDefaultConfig() *UserConfig {
ScrollDownMainAlt2: "<c-d>", ScrollDownMainAlt2: "<c-d>",
ExecuteCustomCommand: ":", ExecuteCustomCommand: ":",
CreateRebaseOptionsMenu: "m", CreateRebaseOptionsMenu: "m",
PushFiles: "P", Push: "P",
PullFiles: "p", Pull: "p",
Refresh: "R", Refresh: "R",
CreatePatchOptionsMenu: "<c-p>", CreatePatchOptionsMenu: "<c-p>",
NextTab: "]", NextTab: "]",

2
pkg/gui/command_log_panel.go
View File

@ -79,7 +79,7 @@ func (gui *Gui) getRandomTip() string {
// keybindings and lazygit-specific advice // keybindings and lazygit-specific advice
fmt.Sprintf( fmt.Sprintf(
"To force push, press '%s' and then if the push is rejected you will be asked if you want to force push", "To force push, press '%s' and then if the push is rejected you will be asked if you want to force push",
formattedKey(config.Universal.PushFiles), formattedKey(config.Universal.Push),
), ),
fmt.Sprintf( fmt.Sprintf(
"To filter commits by path, press '%s'", "To filter commits by path, press '%s'",

4
pkg/gui/controllers/sync_controller.go
View File

@ -28,12 +28,12 @@ func NewSyncController(
func (self *SyncController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { func (self *SyncController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
bindings := []*types.Binding{ bindings := []*types.Binding{
{ {
Key: opts.GetKey(opts.Config.Universal.PushFiles), Key: opts.GetKey(opts.Config.Universal.Push),
Handler: opts.Guards.NoPopupPanel(self.HandlePush), Handler: opts.Guards.NoPopupPanel(self.HandlePush),
Description: self.c.Tr.LcPush, Description: self.c.Tr.LcPush,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.PullFiles), Key: opts.GetKey(opts.Config.Universal.Pull),
Handler: opts.Guards.NoPopupPanel(self.HandlePull), Handler: opts.Guards.NoPopupPanel(self.HandlePull),
Description: self.c.Tr.LcPull, Description: self.c.Tr.LcPull,
}, },

2
pkg/integration/tests/sync/rename_branch_and_pull.go
View File

@ -46,7 +46,7 @@ var RenameBranchAndPull = NewIntegrationTest(NewIntegrationTestArgs{
Type("-local"). Type("-local").
Confirm() Confirm()
}). }).
Press(keys.Universal.PullFiles) Press(keys.Universal.Pull)
t.Views().Commits(). t.Views().Commits().
Lines( Lines(