Documentation
¶
Index ¶
Constants ¶
This section is empty.
Variables ¶
View Source
var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Cherry pick commits from the subcommits view, without conflicts", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell. EmptyCommit("base"). NewBranch("first-branch"). NewBranch("second-branch"). Checkout("first-branch"). EmptyCommit("one"). EmptyCommit("two"). Checkout("second-branch"). EmptyCommit("three"). EmptyCommit("four"). Checkout("first-branch") }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Branches(). Focus(). Lines( Contains("first-branch"), Contains("second-branch"), Contains("master"), ). SelectNextItem(). PressEnter() t.Views().SubCommits(). IsFocused(). Lines( Contains("four").IsSelected(), Contains("three"), Contains("base"), ). Press(keys.Commits.CherryPickCopy). Tap(func() { t.Views().Information().Content(Contains("1 commit copied")) }). SelectNextItem(). Press(keys.Commits.CherryPickCopy) t.Views().Information().Content(Contains("2 commits copied")) t.Views().Commits(). Focus(). Lines( Contains("two").IsSelected(), Contains("one"), Contains("base"), ). Press(keys.Commits.PasteCommits). Tap(func() { t.Views().Information().Content(Contains("2 commits copied")) }). Tap(func() { t.ExpectPopup().Alert(). Title(Equals("Cherry-pick")). Content(Contains("Are you sure you want to cherry-pick the 2 copied commit(s) onto this branch?")). Confirm() }). Tap(func() { t.Views().Information().Content(DoesNotContain("commits copied")) }). Lines( Contains("four"), Contains("three"), Contains("two"), Contains("one"), Contains("base"), ) t.Views().Branches(). Focus(). NavigateToLine(Contains("master")). PressPrimaryAction() t.Views().Commits(). Focus(). Lines( Contains("base").IsSelected(), ). Press(keys.Commits.PasteCommits). Tap(func() { t.ExpectPopup().Alert(). Title(Equals("Cherry-pick")). Content(Contains("Are you sure you want to cherry-pick the 2 copied commit(s) onto this branch?")). Confirm() }). Tap(func() { t.Views().Information().Content(DoesNotContain("commits copied")) }). Lines( Contains("four"), Contains("three"), Contains("base"), ) }, })
View Source
var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Cherry pick commits from the subcommits view, with conflicts", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shared.MergeConflictsSetup(shell) }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Branches(). Focus(). Lines( Contains("first-change-branch"), Contains("second-change-branch"), Contains("original-branch"), ). SelectNextItem(). PressEnter() t.Views().SubCommits(). IsFocused(). TopLines( Contains("second-change-branch unrelated change"), Contains("second change"), ). Press(keys.Commits.CherryPickCopy). Tap(func() { t.Views().Information().Content(Contains("1 commit copied")) }). SelectNextItem(). Press(keys.Commits.CherryPickCopy) t.Views().Information().Content(Contains("2 commits copied")) t.Views().Commits(). Focus(). TopLines( Contains("first change"), ). Press(keys.Commits.PasteCommits) t.ExpectPopup().Alert(). Title(Equals("Cherry-pick")). Content(Contains("Are you sure you want to cherry-pick the 2 copied commit(s) onto this branch?")). Confirm() t.Common().AcknowledgeConflicts() t.Views().Information().Content(Contains("2 commits copied")) t.Views().Files(). IsFocused(). SelectedLine(Contains("file")). PressEnter() t.Views().MergeConflicts(). IsFocused(). SelectNextItem(). PressPrimaryAction() t.Common().ContinueOnConflictsResolved("cherry-pick") t.Views().Files().IsEmpty() t.Views().Commits(). Focus(). TopLines( Contains("second-change-branch unrelated change"), Contains("second change"), Contains("first change"), ). SelectNextItem(). Tap(func() { t.Views().Main(). Content(Contains("-First Change")). Content(Contains("+Second Change")) t.Views().Information().Content(Contains("2 commits copied")) }). PressEscape(). Tap(func() { t.Views().Information().Content(DoesNotContain("commits copied")) }) }, })
View Source
var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Cherry pick commits from the subcommits view during a rebase", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { config.GetAppState().GitLogShowGraph = "never" }, SetupRepo: func(shell *Shell) { shell. EmptyCommit("base"). NewBranch("first-branch"). NewBranch("second-branch"). Checkout("first-branch"). EmptyCommit("one"). EmptyCommit("two"). Checkout("second-branch"). EmptyCommit("three"). EmptyCommit("four"). Checkout("first-branch") }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Branches(). Focus(). Lines( Contains("first-branch"), Contains("second-branch"), Contains("master"), ). SelectNextItem(). PressEnter() t.Views().SubCommits(). IsFocused(). Lines( Contains("four").IsSelected(), Contains("three"), Contains("base"), ). SelectNextItem(). Press(keys.Commits.CherryPickCopy) t.Views().Information().Content(Contains("1 commit copied")) t.Views().Commits(). Focus(). Lines( Contains("CI two").IsSelected(), Contains("CI one"), Contains("CI base"), ). SelectNextItem(). Press(keys.Universal.Edit). Lines( Contains("--- Pending rebase todos ---"), Contains("pick CI two"), Contains("--- Commits ---"), Contains(" CI one").IsSelected(), Contains(" CI base"), ). Press(keys.Commits.PasteCommits). Tap(func() { t.ExpectPopup().Alert(). Title(Equals("Cherry-pick")). Content(Contains("Are you sure you want to cherry-pick the 1 copied commit(s) onto this branch?")). Confirm() }). Tap(func() { t.Views().Information().Content(DoesNotContain("commit copied")) }). Lines( Contains("--- Pending rebase todos ---"), Contains("pick CI two"), Contains("--- Commits ---"), Contains(" CI three"), Contains(" CI one"), Contains(" CI base"), ). Tap(func() { t.Common().ContinueRebase() }). Lines( Contains("CI two"), Contains("CI three"), Contains("CI one"), Contains("CI base"), ) }, })
View Source
var CherryPickMerge = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Cherry pick a merge commit", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell. EmptyCommit("base"). NewBranch("first-branch"). NewBranch("second-branch"). CreateFileAndAdd("file1.txt", "content"). Commit("one"). CreateFileAndAdd("file2.txt", "content"). Commit("two"). Checkout("master"). Merge("second-branch"). Checkout("first-branch") }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Branches(). Focus(). Lines( Contains("first-branch"), Contains("master"), Contains("second-branch"), ). SelectNextItem(). PressEnter() t.Views().SubCommits(). IsFocused(). Lines( Contains("⏣─╮ Merge branch 'second-branch'").IsSelected(), Contains("│ ◯ two"), Contains("│ ◯ one"), Contains("◯ ╯ base"), ). Press(keys.Commits.CherryPickCopy) t.Views().Information().Content(Contains("1 commit copied")) t.Views().Commits(). Focus(). Lines( Contains("base").IsSelected(), ). Press(keys.Commits.PasteCommits). Tap(func() { t.ExpectPopup().Alert(). Title(Equals("Cherry-pick")). Content(Contains("Are you sure you want to cherry-pick the 1 copied commit(s) onto this branch?")). Confirm() }). Tap(func() { t.Views().Information().Content(DoesNotContain("commit copied")) }). Lines( Contains("Merge branch 'second-branch'").IsSelected(), Contains("base"), ) t.Views().Main().ContainsLines( Contains("Merge branch 'second-branch'"), Contains("---"), Contains("file1.txt | 1 +"), Contains("file2.txt | 1 +"), Contains("2 files changed, 2 insertions(+)"), ) }, })
View Source
var CherryPickRange = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Cherry pick range of commits from the subcommits view, without conflicts", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell. EmptyCommit("base"). NewBranch("first-branch"). NewBranch("second-branch"). Checkout("first-branch"). EmptyCommit("one"). EmptyCommit("two"). Checkout("second-branch"). EmptyCommit("three"). EmptyCommit("four"). Checkout("first-branch") }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Views().Branches(). Focus(). Lines( Contains("first-branch"), Contains("second-branch"), Contains("master"), ). SelectNextItem(). PressEnter() t.Views().SubCommits(). IsFocused(). Lines( Contains("four").IsSelected(), Contains("three"), Contains("base"), ). Press(keys.Universal.RangeSelectDown). Lines( Contains("four").IsSelected(), Contains("three").IsSelected(), Contains("base"), ). Press(keys.Commits.CherryPickCopy) t.Views().Information().Content(Contains("2 commits copied")) t.Views().Commits(). Focus(). Lines( Contains("two").IsSelected(), Contains("one"), Contains("base"), ). Press(keys.Commits.PasteCommits). Tap(func() { t.ExpectPopup().Alert(). Title(Equals("Cherry-pick")). Content(Contains("Are you sure you want to cherry-pick the 2 copied commit(s) onto this branch?")). Confirm() }). Tap(func() { t.Views().Information().Content(DoesNotContain("commits copied")) }). Lines( Contains("four"), Contains("three"), Contains("two"), Contains("one"), Contains("base"), ) }, })
Functions ¶
This section is empty.
Types ¶
This section is empty.
Click to show internal directories.
Click to hide internal directories.