From b432fb5efef09f43e3dfa94b5ae5e4fd6aca63bc Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Thu, 3 Aug 2023 19:07:56 +1000 Subject: [PATCH 1/4] Add undo/redo demo --- pkg/integration/tests/demo/undo.go | 71 ++++++++++++++++++++++++++++++ pkg/integration/tests/test_list.go | 1 + 2 files changed, 72 insertions(+) create mode 100644 pkg/integration/tests/demo/undo.go diff --git a/pkg/integration/tests/demo/undo.go b/pkg/integration/tests/demo/undo.go new file mode 100644 index 000000000..f11a514ac --- /dev/null +++ b/pkg/integration/tests/demo/undo.go @@ -0,0 +1,71 @@ +package demo + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +// TODO: fix confirmation view wrapping issue: https://github.com/jesseduffield/lazygit/issues/2872 + +var Undo = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Undo", + ExtraCmdArgs: []string{}, + Skip: false, + IsDemo: true, + SetupConfig: func(config *config.AppConfig) { + // No idea why I had to use version 2: it should be using my own computer's + // font and the one iterm uses is version 3. + config.UserConfig.Gui.NerdFontsVersion = "2" + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommitsWithRandomMessages(30) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.SetCaptionPrefix("Undo commands") + t.Wait(1000) + + confirmCommitDrop := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Delete commit")). + Content(Equals("Are you sure you want to delete this commit?")). + Wait(500). + Confirm() + } + + confirmUndo := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Undo")). + Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)). + Wait(500). + Confirm() + } + + confirmRedo := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Redo")). + Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)). + Wait(500). + Confirm() + } + + t.Views().Commits().Focus(). + SetCaptionPrefix("Drop two commits"). + Wait(1000). + Press(keys.Universal.Remove). + Tap(confirmCommitDrop). + Press(keys.Universal.Remove). + Tap(confirmCommitDrop). + SetCaptionPrefix("Undo the drops"). + Wait(1000). + Press(keys.Universal.Undo). + Tap(confirmUndo). + Press(keys.Universal.Undo). + Tap(confirmUndo). + SetCaptionPrefix("Redo the drops"). + Wait(1000). + Press(keys.Universal.Redo). + Tap(confirmRedo). + Press(keys.Universal.Redo). + Tap(confirmRedo) + }, +}) diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go index 75508784e..c1e41bc91 100644 --- a/pkg/integration/tests/test_list.go +++ b/pkg/integration/tests/test_list.go @@ -97,6 +97,7 @@ var tests = []*components.IntegrationTest{ demo.InteractiveRebase, demo.NukeWorkingTree, demo.StageLines, + demo.Undo, diff.Diff, diff.DiffAndApplyPatch, diff.DiffCommits, From 096628e3662bce97e312a7a9596a9ed86b141b8f Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Fri, 4 Aug 2023 08:38:15 +1000 Subject: [PATCH 2/4] Add custom command demo --- README.md | 6 ++ pkg/integration/tests/demo/custom_command.go | 78 ++++++++++++++++++++ pkg/integration/tests/test_list.go | 1 + 3 files changed, 85 insertions(+) create mode 100644 pkg/integration/tests/demo/custom_command.go diff --git a/README.md b/README.md index f22393fd8..49116c065 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,12 @@ You can filter a view with `/`. Here we filter down our branches view and then h ![filter](../assets/demo/filter-compressed.gif) +### Invoke a custom command + +Lazygit has a very flexible [custom command system](docs/Custom_Command_Keybindings.md). In this example a custom command is defined which emulates the built-in branch checkout action. + +![custom_command](../assets/demo/custom_command-compressed.gif) + ## Tutorials [](https://youtu.be/CPLdltN7wgE) diff --git a/pkg/integration/tests/demo/custom_command.go b/pkg/integration/tests/demo/custom_command.go new file mode 100644 index 000000000..46b6b515e --- /dev/null +++ b/pkg/integration/tests/demo/custom_command.go @@ -0,0 +1,78 @@ +package demo + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var customCommandContent = ` +customCommands: + - key: 'a' + command: 'git checkout {{.Form.Branch}}' + context: 'localBranches' + prompts: + - type: 'input' + title: 'Enter a branch name to checkout:' + key: 'Branch' + suggestions: + preset: 'branches' +` + +var CustomCommand = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Invoke a custom command", + ExtraCmdArgs: []string{}, + Skip: false, + IsDemo: true, + SetupConfig: func(cfg *config.AppConfig) { + // No idea why I had to use version 2: it should be using my own computer's + // font and the one iterm uses is version 3. + cfg.UserConfig.Gui.NerdFontsVersion = "2" + + cfg.UserConfig.CustomCommands = []config.CustomCommand{ + { + Key: "a", + Context: "localBranches", + Command: `git checkout {{.Form.Branch}}`, + Prompts: []config.CustomCommandPrompt{ + { + Key: "Branch", + Type: "input", + Title: "Enter a branch name to checkout", + Suggestions: config.CustomCommandSuggestions{ + Preset: "branches", + }, + }, + }, + }, + } + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommitsWithRandomMessages(30) + shell.NewBranch("feature/user-authentication") + shell.NewBranch("feature/payment-processing") + shell.NewBranch("feature/search-functionality") + shell.NewBranch("feature/mobile-responsive") + shell.EmptyCommit("Make mobile response") + shell.NewBranch("bugfix/fix-login-issue") + shell.HardReset("HEAD~1") + shell.NewBranch("bugfix/fix-crash-bug") + shell.CreateFile("custom_commands_example.yml", customCommandContent) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.SetCaptionPrefix("Invoke a custom command") + t.Wait(1500) + + t.Views().Branches(). + Focus(). + Wait(500). + Press("a"). + Tap(func() { + t.Wait(500) + + t.ExpectPopup().Prompt(). + Title(Equals("Enter a branch name to checkout")). + Type("mobile"). + ConfirmFirstSuggestion() + }) + }, +}) diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go index c1e41bc91..1b1fa876d 100644 --- a/pkg/integration/tests/test_list.go +++ b/pkg/integration/tests/test_list.go @@ -93,6 +93,7 @@ var tests = []*components.IntegrationTest{ demo.Bisect, demo.CherryPick, demo.CommitAndPush, + demo.CustomCommand, demo.Filter, demo.InteractiveRebase, demo.NukeWorkingTree, From 996ad5bf263a253a527897accf53e3d198c0345c Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Fri, 4 Aug 2023 08:54:13 +1000 Subject: [PATCH 3/4] Add worktree demo --- README.md | 8 +++ .../demo/worktree_create_from_branches.go | 59 +++++++++++++++++++ pkg/integration/tests/test_list.go | 1 + 3 files changed, 68 insertions(+) create mode 100644 pkg/integration/tests/demo/worktree_create_from_branches.go diff --git a/README.md b/README.md index 49116c065..946b7272f 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,14 @@ Lazygit has a very flexible [custom command system](docs/Custom_Command_Keybindi ![custom_command](../assets/demo/custom_command-compressed.gif) +### Worktrees + +You can create worktrees to have multiple branches going at once without the need for stashing or creating WIP commits when switching between them. Press `w` in the branches view to create a worktree from the selected branch and switch to it. + +![worktree_create_from_branches](../assets/demo/worktree_create_from_branches-compressed.gif) + +### Rebase magic (custom patches) + ## Tutorials [](https://youtu.be/CPLdltN7wgE) diff --git a/pkg/integration/tests/demo/worktree_create_from_branches.go b/pkg/integration/tests/demo/worktree_create_from_branches.go new file mode 100644 index 000000000..d25b531d2 --- /dev/null +++ b/pkg/integration/tests/demo/worktree_create_from_branches.go @@ -0,0 +1,59 @@ +package demo + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var WorktreeCreateFromBranches = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create a worktree from the branches view", + ExtraCmdArgs: []string{}, + Skip: false, + IsDemo: true, + SetupConfig: func(cfg *config.AppConfig) { + // No idea why I had to use version 2: it should be using my own computer's + // font and the one iterm uses is version 3. + cfg.UserConfig.Gui.NerdFontsVersion = "2" + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommitsWithRandomMessages(30) + shell.NewBranch("feature/user-authentication") + shell.EmptyCommit("Add user authentication feature") + shell.EmptyCommit("Fix local session storage") + shell.CreateFile("src/authentication.go", "package main") + shell.CreateFile("src/shims.go", "package main") + shell.CreateFile("src/session.go", "package main") + shell.EmptyCommit("Stop using shims") + shell.UpdateFile("src/authentication.go", "package authentication") + shell.UpdateFileAndAdd("src/shims.go", "// removing for now") + shell.UpdateFile("src/session.go", "package session") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.SetCaptionPrefix("Create a worktree from a branch") + t.Wait(1000) + + t.Views().Branches(). + Focus(). + NavigateToLine(Contains("master")). + Wait(500). + Press(keys.Worktrees.ViewWorktreeOptions). + Tap(func() { + t.Wait(500) + + t.ExpectPopup().Menu(). + Title(Equals("Worktree")). + Select(Contains("Create worktree from master").DoesNotContain("detached")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("New worktree path")). + Type("../hotfix"). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Contains("New branch name")). + Type("hotfix/db-on-fire"). + Confirm() + }) + }, +}) diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go index 1b1fa876d..c5e94c532 100644 --- a/pkg/integration/tests/test_list.go +++ b/pkg/integration/tests/test_list.go @@ -99,6 +99,7 @@ var tests = []*components.IntegrationTest{ demo.NukeWorkingTree, demo.StageLines, demo.Undo, + demo.WorktreeCreateFromBranches, diff.Diff, diff.DiffAndApplyPatch, diff.DiffCommits, From f6af4c29d4bd4826b570af6ac72bb8bc50c6f16c Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Fri, 4 Aug 2023 09:15:07 +1000 Subject: [PATCH 4/4] Add custom patch demo --- README.md | 8 +++ pkg/integration/components/menu_driver.go | 6 ++ pkg/integration/tests/demo/custom_patch.go | 76 ++++++++++++++++++++++ pkg/integration/tests/test_list.go | 1 + 4 files changed, 91 insertions(+) create mode 100644 pkg/integration/tests/demo/custom_patch.go diff --git a/README.md b/README.md index 946b7272f..5849bbb28 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,14 @@ You can create worktrees to have multiple branches going at once without the nee ### Rebase magic (custom patches) +You can build a custom patch from an old commit and then remove the patch from the commit, split out a new commit, apply the patch in reverse to the index, and more. + +In this example we have a redundant comment that we want to remove from an old commit. We hit `` on the commit to view its files, then `` on a file to focus the patch, then `` to add the comment line to our custom patch, and then `ctrl+p` to view the custom patch options; selecting to remove the patch from the current commit. + +Learn more in the [Rebase magic Youtube tutorial](https://youtu.be/4XaToVut_hs). + +![custom_patch](../assets/demo/custom_patch-compressed.gif) + ## Tutorials [](https://youtu.be/CPLdltN7wgE) diff --git a/pkg/integration/components/menu_driver.go b/pkg/integration/components/menu_driver.go index 4e0b0f6da..34d081dfa 100644 --- a/pkg/integration/components/menu_driver.go +++ b/pkg/integration/components/menu_driver.go @@ -60,6 +60,12 @@ func (self *MenuDriver) LineCount(matcher *IntMatcher) *MenuDriver { return self } +func (self *MenuDriver) Wait(milliseconds int) *MenuDriver { + self.getViewDriver().Wait(milliseconds) + + return self +} + func (self *MenuDriver) checkNecessaryChecksCompleted() { if !self.hasCheckedTitle { self.t.Fail("You must check the title of a menu popup by calling Title() before calling Confirm()/Cancel().") diff --git a/pkg/integration/tests/demo/custom_patch.go b/pkg/integration/tests/demo/custom_patch.go new file mode 100644 index 000000000..b110054a5 --- /dev/null +++ b/pkg/integration/tests/demo/custom_patch.go @@ -0,0 +1,76 @@ +package demo + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var usersFileContent = `package main + +import "fmt" + +func main() { + // TODO: verify that this actuall works + fmt.Println("hello world") +} +` + +var CustomPatch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Remove a line from an old commit", + ExtraCmdArgs: []string{}, + Skip: false, + IsDemo: true, + SetupConfig: func(cfg *config.AppConfig) { + // No idea why I had to use version 2: it should be using my own computer's + // font and the one iterm uses is version 3. + cfg.UserConfig.Gui.NerdFontsVersion = "2" + }, + SetupRepo: func(shell *Shell) { + shell.CreateNCommitsWithRandomMessages(30) + shell.NewBranch("feature/user-authentication") + shell.EmptyCommit("Add user authentication feature") + shell.CreateFileAndAdd("src/users.go", "package main\n") + shell.Commit("Fix local session storage") + shell.CreateFile("src/authentication.go", "package main") + shell.CreateFile("src/session.go", "package main") + shell.UpdateFileAndAdd("src/users.go", usersFileContent) + shell.EmptyCommit("Stop using shims") + shell.UpdateFileAndAdd("src/authentication.go", "package authentication") + shell.UpdateFileAndAdd("src/session.go", "package session") + shell.Commit("Enhance user authentication feature") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.SetCaptionPrefix("Remove a line from an old commit") + t.Wait(1000) + + t.Views().Commits(). + Focus(). + NavigateToLine(Contains("Stop using shims")). + Wait(1000). + PressEnter(). + Tap(func() { + t.Views().CommitFiles(). + IsFocused(). + NavigateToLine(Contains("users.go")). + Wait(1000). + PressEnter(). + Tap(func() { + t.Views().PatchBuilding(). + IsFocused(). + NavigateToLine(Contains("TODO")). + Wait(500). + PressPrimaryAction(). + PressEscape() + }). + Press(keys.Universal.CreatePatchOptionsMenu). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Patch options")). + Select(Contains("Remove patch from original commit")). + Wait(500). + Confirm() + }). + PressEscape() + }) + }, +}) diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go index c5e94c532..f71a3981e 100644 --- a/pkg/integration/tests/test_list.go +++ b/pkg/integration/tests/test_list.go @@ -94,6 +94,7 @@ var tests = []*components.IntegrationTest{ demo.CherryPick, demo.CommitAndPush, demo.CustomCommand, + demo.CustomPatch, demo.Filter, demo.InteractiveRebase, demo.NukeWorkingTree,