From 0719a3e36e530ebc6716538ef4581d1929df8ab9 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 6 Apr 2021 15:13:40 +1000 Subject: [PATCH] stop checking out branches when doing a rename. Instead just move the cursor to the new position --- pkg/gui/branches_panel.go | 21 +++++++++++------- .../branchRename/expected/.git_keep/HEAD | 2 +- .../branchRename/expected/.git_keep/index | Bin 137 -> 137 bytes .../branchRename/expected/.git_keep/logs/HEAD | 20 ++++++++--------- .../expected/.git_keep/logs/refs/heads/123 | 2 -- .../expected/.git_keep/logs/refs/heads/blah | 2 ++ .../expected/.git_keep/logs/refs/heads/haha | 2 ++ .../expected/.git_keep/logs/refs/heads/master | 2 +- .../.git_keep/logs/refs/heads/new-branch | 2 +- .../.git_keep/logs/refs/heads/new-branch-2 | 2 +- .../.git_keep/logs/refs/heads/new-branch-3 | 2 +- .../.git_keep/logs/refs/heads/old-branch | 1 - .../.git_keep/logs/refs/heads/old-branch-10 | 2 -- .../.git_keep/logs/refs/heads/old-branch-2 | 1 + .../6b/4faf392c2938a01ce7256111dd23cfbb43e8cc | 2 ++ .../76/4ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 | Bin 118 -> 0 bytes .../expected/.git_keep/refs/heads/123 | 1 - .../expected/.git_keep/refs/heads/blah | 1 + .../expected/.git_keep/refs/heads/haha | 1 + .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/refs/heads/new-branch | 2 +- .../.git_keep/refs/heads/new-branch-2 | 2 +- .../.git_keep/refs/heads/new-branch-3 | 2 +- .../expected/.git_keep/refs/heads/old-branch | 1 - .../.git_keep/refs/heads/old-branch-10 | 1 - .../.git_keep/refs/heads/old-branch-2 | 1 + test/integration/branchRename/recording.json | 2 +- test/integration/branchRename/test.json | 2 +- 28 files changed, 43 insertions(+), 38 deletions(-) delete mode 100644 test/integration/branchRename/expected/.git_keep/logs/refs/heads/123 create mode 100644 test/integration/branchRename/expected/.git_keep/logs/refs/heads/blah create mode 100644 test/integration/branchRename/expected/.git_keep/logs/refs/heads/haha delete mode 100644 test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch delete mode 100644 test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-10 create mode 100644 test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-2 create mode 100644 test/integration/branchRename/expected/.git_keep/objects/6b/4faf392c2938a01ce7256111dd23cfbb43e8cc delete mode 100644 test/integration/branchRename/expected/.git_keep/objects/76/4ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 delete mode 100644 test/integration/branchRename/expected/.git_keep/refs/heads/123 create mode 100644 test/integration/branchRename/expected/.git_keep/refs/heads/blah create mode 100644 test/integration/branchRename/expected/.git_keep/refs/heads/haha delete mode 100644 test/integration/branchRename/expected/.git_keep/refs/heads/old-branch delete mode 100644 test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-10 create mode 100644 test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-2 diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 6f88e3843..a24c6a7e9 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -428,9 +428,6 @@ func (gui *Gui) handleRenameBranch() error { return nil } - // TODO: find a way to not checkout the branch here if it's not the current branch (i.e. find some - // way to get it to show up in the reflog) - promptForNewName := func() error { return gui.prompt(promptOpts{ title: gui.Tr.NewBranchNamePrompt + " " + branch.Name + ":", @@ -439,13 +436,21 @@ func (gui *Gui) handleRenameBranch() error { if err := gui.GitCommand.RenameBranch(branch.Name, newBranchName); err != nil { return gui.surfaceError(err) } - // need to checkout so that the branch shows up in our reflog and therefore - // doesn't get lost among all the other branches when we switch to something else - if err := gui.GitCommand.Checkout(newBranchName, commands.CheckoutOptions{Force: false}); err != nil { - return gui.surfaceError(err) + + // need to find where the branch is now so that we can re-select it. That means we need to refetch the branches synchronously and then find our branch + gui.refreshBranches() + + // now that we've got our stuff again we need to find that branch and reselect it. + for i, newBranch := range gui.State.Branches { + if newBranch.Name == newBranchName { + gui.State.Panels.Branches.SetSelectedLineIdx(i) + if err := gui.State.Contexts.Branches.HandleRender(); err != nil { + return err + } + } } - return gui.refreshSidePanels(refreshOptions{mode: ASYNC}) + return nil }, }) } diff --git a/test/integration/branchRename/expected/.git_keep/HEAD b/test/integration/branchRename/expected/.git_keep/HEAD index aa0269237..1b6a93f59 100644 --- a/test/integration/branchRename/expected/.git_keep/HEAD +++ b/test/integration/branchRename/expected/.git_keep/HEAD @@ -1 +1 @@ -ref: refs/heads/123 +ref: refs/heads/blah diff --git a/test/integration/branchRename/expected/.git_keep/index b/test/integration/branchRename/expected/.git_keep/index index 632a20b0c1ac100ea11f034e26bf78875661753e..1f2d6ec46f640368f3916dd32345601b8e3ca0f7 100644 GIT binary patch delta 65 zcmeBV>||7N@eFciU|?VZV#b8*w||7N@eFciU|?VZV#b8*mlA3-zpRDPj0_AcY 1617684760 +1000 commit (initial): file0 -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 checkout: moving from master to new-branch -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 checkout: moving from new-branch to new-branch-2 -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 checkout: moving from new-branch-2 to new-branch-3 -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 checkout: moving from new-branch-3 to old-branch -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 checkout: moving from old-branch to old-branch-2 -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 checkout: moving from old-branch-2 to old-branch-3 -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 0000000000000000000000000000000000000000 CI 1617684766 +1000 Branch: renamed refs/heads/old-branch-3 to refs/heads/old-branch-10 -0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684766 +1000 Branch: renamed refs/heads/old-branch-3 to refs/heads/old-branch-10 -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684766 +1000 checkout: moving from old-branch-10 to old-branch-10 -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684772 +1000 checkout: moving from old-branch-10 to 123 +0000000000000000000000000000000000000000 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 commit (initial): file0 +6b4faf392c2938a01ce7256111dd23cfbb43e8cc 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 checkout: moving from master to new-branch +6b4faf392c2938a01ce7256111dd23cfbb43e8cc 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 checkout: moving from new-branch to new-branch-2 +6b4faf392c2938a01ce7256111dd23cfbb43e8cc 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 checkout: moving from new-branch-2 to new-branch-3 +6b4faf392c2938a01ce7256111dd23cfbb43e8cc 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 checkout: moving from new-branch-3 to old-branch +6b4faf392c2938a01ce7256111dd23cfbb43e8cc 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 checkout: moving from old-branch to old-branch-2 +6b4faf392c2938a01ce7256111dd23cfbb43e8cc 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 checkout: moving from old-branch-2 to old-branch-3 +6b4faf392c2938a01ce7256111dd23cfbb43e8cc 0000000000000000000000000000000000000000 CI 1617685967 +1000 Branch: renamed refs/heads/old-branch-3 to refs/heads/blah +0000000000000000000000000000000000000000 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685967 +1000 Branch: renamed refs/heads/old-branch-3 to refs/heads/blah diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/123 b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/123 deleted file mode 100644 index b4049fb5c..000000000 --- a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/123 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 branch: Created from HEAD -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684772 +1000 Branch: renamed refs/heads/old-branch-2 to refs/heads/123 diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/blah b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/blah new file mode 100644 index 000000000..487fdd395 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/blah @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 branch: Created from HEAD +6b4faf392c2938a01ce7256111dd23cfbb43e8cc 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685967 +1000 Branch: renamed refs/heads/old-branch-3 to refs/heads/blah diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/haha b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/haha new file mode 100644 index 000000000..a17ae8db2 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/haha @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 branch: Created from HEAD +6b4faf392c2938a01ce7256111dd23cfbb43e8cc 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685976 +1000 Branch: renamed refs/heads/old-branch to refs/heads/haha diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/master b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/master index 148b5a5f5..24b421e5e 100644 --- a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 commit (initial): file0 +0000000000000000000000000000000000000000 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 commit (initial): file0 diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch index 2a601361e..138d29c12 100644 --- a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch @@ -1 +1 @@ -0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 branch: Created from HEAD diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-2 b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-2 index 2a601361e..138d29c12 100644 --- a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-2 +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-2 @@ -1 +1 @@ -0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 branch: Created from HEAD diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-3 b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-3 index 2a601361e..138d29c12 100644 --- a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-3 +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/new-branch-3 @@ -1 +1 @@ -0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 branch: Created from HEAD +0000000000000000000000000000000000000000 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 branch: Created from HEAD diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch deleted file mode 100644 index 2a601361e..000000000 --- a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 branch: Created from HEAD diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-10 b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-10 deleted file mode 100644 index 83fdd2e00..000000000 --- a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-10 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684760 +1000 branch: Created from HEAD -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 CI 1617684766 +1000 Branch: renamed refs/heads/old-branch-3 to refs/heads/old-branch-10 diff --git a/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-2 b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-2 new file mode 100644 index 000000000..138d29c12 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/logs/refs/heads/old-branch-2 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6b4faf392c2938a01ce7256111dd23cfbb43e8cc CI 1617685961 +1000 branch: Created from HEAD diff --git a/test/integration/branchRename/expected/.git_keep/objects/6b/4faf392c2938a01ce7256111dd23cfbb43e8cc b/test/integration/branchRename/expected/.git_keep/objects/6b/4faf392c2938a01ce7256111dd23cfbb43e8cc new file mode 100644 index 000000000..5861ba744 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/objects/6b/4faf392c2938a01ce7256111dd23cfbb43e8cc @@ -0,0 +1,2 @@ +xA +0@Q9IDz`!Dn?j];f@v7 IUs!Hdc*\Ч\+wi4mi $dT۟ܕu3t?C+ \ No newline at end of file diff --git a/test/integration/branchRename/expected/.git_keep/objects/76/4ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 b/test/integration/branchRename/expected/.git_keep/objects/76/4ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 deleted file mode 100644 index 8c2e1bca0c1d53582bc7c20c437d80c1c1461d6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{iDS}$h|pD!ku-m>&=4sRdi?eXZXX}Kxz)OK z64guJ0218cdWx*2G``w2j7zp5ye!9_x3-ZEp2N;>5c_ Yy<@rxGn=!Xla4>RDa#5r2i*ZH_Co|ZwEzGB diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/123 b/test/integration/branchRename/expected/.git_keep/refs/heads/123 deleted file mode 100644 index 50a1aeda5..000000000 --- a/test/integration/branchRename/expected/.git_keep/refs/heads/123 +++ /dev/null @@ -1 +0,0 @@ -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/blah b/test/integration/branchRename/expected/.git_keep/refs/heads/blah new file mode 100644 index 000000000..775cae115 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/blah @@ -0,0 +1 @@ +6b4faf392c2938a01ce7256111dd23cfbb43e8cc diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/haha b/test/integration/branchRename/expected/.git_keep/refs/heads/haha new file mode 100644 index 000000000..775cae115 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/haha @@ -0,0 +1 @@ +6b4faf392c2938a01ce7256111dd23cfbb43e8cc diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/master b/test/integration/branchRename/expected/.git_keep/refs/heads/master index 50a1aeda5..775cae115 100644 --- a/test/integration/branchRename/expected/.git_keep/refs/heads/master +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 +6b4faf392c2938a01ce7256111dd23cfbb43e8cc diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch index 50a1aeda5..775cae115 100644 --- a/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch @@ -1 +1 @@ -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 +6b4faf392c2938a01ce7256111dd23cfbb43e8cc diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-2 b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-2 index 50a1aeda5..775cae115 100644 --- a/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-2 +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-2 @@ -1 +1 @@ -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 +6b4faf392c2938a01ce7256111dd23cfbb43e8cc diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-3 b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-3 index 50a1aeda5..775cae115 100644 --- a/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-3 +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/new-branch-3 @@ -1 +1 @@ -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 +6b4faf392c2938a01ce7256111dd23cfbb43e8cc diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch b/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch deleted file mode 100644 index 50a1aeda5..000000000 --- a/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch +++ /dev/null @@ -1 +0,0 @@ -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-10 b/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-10 deleted file mode 100644 index 50a1aeda5..000000000 --- a/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-10 +++ /dev/null @@ -1 +0,0 @@ -764ffd4a377531ac55c5c0a1ce0b5f8dfedb3276 diff --git a/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-2 b/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-2 new file mode 100644 index 000000000..775cae115 --- /dev/null +++ b/test/integration/branchRename/expected/.git_keep/refs/heads/old-branch-2 @@ -0,0 +1 @@ +6b4faf392c2938a01ce7256111dd23cfbb43e8cc diff --git a/test/integration/branchRename/recording.json b/test/integration/branchRename/recording.json index 61cf2bea0..7d7311fb5 100644 --- a/test/integration/branchRename/recording.json +++ b/test/integration/branchRename/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":550,"Mod":0,"Key":259,"Ch":0},{"Timestamp":919,"Mod":0,"Key":256,"Ch":82},{"Timestamp":1568,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1792,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1984,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2152,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2304,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2464,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2624,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2800,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2968,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3151,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3327,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3512,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3696,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3872,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4064,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4743,"Mod":0,"Key":127,"Ch":127},{"Timestamp":5112,"Mod":0,"Key":256,"Ch":49},{"Timestamp":5208,"Mod":0,"Key":256,"Ch":48},{"Timestamp":5543,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6256,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6919,"Mod":0,"Key":256,"Ch":82},{"Timestamp":7896,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8048,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8175,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8311,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8440,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8584,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8720,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8856,"Mod":0,"Key":271,"Ch":0},{"Timestamp":8991,"Mod":0,"Key":271,"Ch":0},{"Timestamp":9136,"Mod":0,"Key":271,"Ch":0},{"Timestamp":9280,"Mod":0,"Key":271,"Ch":0},{"Timestamp":9424,"Mod":0,"Key":271,"Ch":0},{"Timestamp":9560,"Mod":0,"Key":271,"Ch":0},{"Timestamp":10200,"Mod":2,"Key":21,"Ch":21},{"Timestamp":11079,"Mod":0,"Key":256,"Ch":49},{"Timestamp":11287,"Mod":0,"Key":256,"Ch":50},{"Timestamp":11383,"Mod":0,"Key":256,"Ch":51},{"Timestamp":11728,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12423,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":819,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1562,"Mod":0,"Key":256,"Ch":82},{"Timestamp":2260,"Mod":0,"Key":271,"Ch":0},{"Timestamp":2394,"Mod":0,"Key":271,"Ch":0},{"Timestamp":2515,"Mod":0,"Key":271,"Ch":0},{"Timestamp":2658,"Mod":0,"Key":271,"Ch":0},{"Timestamp":2794,"Mod":0,"Key":271,"Ch":0},{"Timestamp":2922,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3066,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3203,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3338,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3475,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3603,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3738,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3883,"Mod":0,"Key":271,"Ch":0},{"Timestamp":4507,"Mod":2,"Key":21,"Ch":21},{"Timestamp":5218,"Mod":0,"Key":256,"Ch":98},{"Timestamp":5363,"Mod":0,"Key":256,"Ch":108},{"Timestamp":5491,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5570,"Mod":0,"Key":256,"Ch":104},{"Timestamp":5843,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7098,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7858,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9563,"Mod":0,"Key":256,"Ch":82},{"Timestamp":10835,"Mod":0,"Key":271,"Ch":0},{"Timestamp":10994,"Mod":0,"Key":271,"Ch":0},{"Timestamp":11130,"Mod":0,"Key":271,"Ch":0},{"Timestamp":11274,"Mod":0,"Key":271,"Ch":0},{"Timestamp":11411,"Mod":0,"Key":271,"Ch":0},{"Timestamp":11562,"Mod":0,"Key":271,"Ch":0},{"Timestamp":11707,"Mod":0,"Key":271,"Ch":0},{"Timestamp":11858,"Mod":0,"Key":271,"Ch":0},{"Timestamp":12019,"Mod":0,"Key":271,"Ch":0},{"Timestamp":12235,"Mod":0,"Key":271,"Ch":0},{"Timestamp":12443,"Mod":0,"Key":271,"Ch":0},{"Timestamp":13050,"Mod":2,"Key":21,"Ch":21},{"Timestamp":13778,"Mod":0,"Key":256,"Ch":104},{"Timestamp":13874,"Mod":0,"Key":256,"Ch":97},{"Timestamp":13979,"Mod":0,"Key":256,"Ch":104},{"Timestamp":14082,"Mod":0,"Key":256,"Ch":97},{"Timestamp":14426,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15915,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/branchRename/test.json b/test/integration/branchRename/test.json index fafad1962..9c16e84fc 100644 --- a/test/integration/branchRename/test.json +++ b/test/integration/branchRename/test.json @@ -1 +1 @@ -{ "description": "Checking out a branch with name suggestions", "speed": 100 } +{ "description": "Checking out a branch with name suggestions", "speed": 10 }