Stefan Haller
67b8ef449c
Edit by breaking after current commit
...
Instead of rebasing from the commit below the current one and then setting the
current one to "edit", we rebase from the current one and insert a "break" after
it. In most cases the behavior is exactly the same as before, except that the
new method also works if the current commit is a merge commit. This is useful if
you want to create a new commit at the very beginning of your branch (by editing
the last commit before your branch).
2023-02-19 10:21:01 +01:00
Stefan Haller
bb856ad7c6
Bump minimum required git version to 2.20
...
We need this because the next commit is going to make use of the "break"
interactive rebase instruction, which was added in 2.20.
2023-02-19 10:20:14 +01:00
Jesse Duffield
b54b8ae746
Merge pull request #2450 from jesseduffield/migrate-more-tests
2023-02-19 15:51:17 +11:00
Jesse Duffield
65bd0ab431
migrate undo test
2023-02-19 15:48:09 +11:00
Jesse Duffield
93b9e1bd19
migrate merge conflict undo test
2023-02-19 15:48:09 +11:00
Jesse Duffield
a51f64814c
show snapshot of lazygit when test fails for easier investigation
2023-02-19 15:48:09 +11:00
Jesse Duffield
b5e325b0a4
migrate revert merge test
2023-02-19 15:48:09 +11:00
Jesse Duffield
88c76868ba
migrate initial open test
2023-02-19 15:48:09 +11:00
Jesse Duffield
e471567b5d
remove already migrated test
2023-02-19 15:48:09 +11:00
Jesse Duffield
13ee0f0a5d
migrate open to branches with cli arg test
2023-02-19 15:48:09 +11:00
Jesse Duffield
76a1b501f2
migrate more force push tests
2023-02-19 15:48:09 +11:00
Jesse Duffield
7201a91b69
remove unneeded config setting
2023-02-19 13:51:37 +11:00
Jesse Duffield
31d796ee75
migrate forcePush integration test
2023-02-19 13:38:15 +11:00
Jesse Duffield
0ac869a415
allow syncing tests from vscode
2023-02-19 13:38:07 +11:00
Jesse Duffield
9da9143aed
Merge pull request #2449 from jesseduffield/migrate-pull-tests
2023-02-19 12:49:49 +11:00
Jesse Duffield
b0383ba73a
update readme
2023-02-19 12:42:48 +11:00
Jesse Duffield
a3096e720c
migrate pullAndSetUpstream test
2023-02-19 12:42:48 +11:00
Jesse Duffield
c599aaed51
migrate pull integration test
2023-02-19 11:48:21 +11:00
Jesse Duffield
f999bbce7c
add code generator for creating tests list
2023-02-19 11:48:09 +11:00
Jesse Duffield
bff076c70a
rename key to Pull
2023-02-19 11:42:00 +11:00
Stefan Haller
979c3d6278
Fix yellow/red coloring of pushed/unpushed commits in branch commits panel ( #2448 )
2023-02-19 10:13:46 +11:00
README-bot
1fc8823825
Updated README.md
2023-02-18 23:11:27 +00:00
Jesse Duffield
eeb9c02836
Merge pull request #2447 from stefanhaller/cleanup-leftovers-from-2444
2023-02-19 10:11:12 +11:00
stk
4d39668743
Undo a change made in #2444 that we didn't end up needing
2023-02-18 09:53:31 +01:00
README-bot
627cc285f7
Updated README.md
2023-02-17 23:34:46 +00:00
Jesse Duffield
bee338f93b
Merge pull request #2444 from stefanhaller/fix-selecting-next-stageable-line
2023-02-18 10:34:31 +11:00
Jesse Duffield
01bf7f21e6
bump gocui
2023-02-18 10:28:09 +11:00
Jesse Duffield
c517d1e0a2
update view cursor when selecting new line in patch explorer view
2023-02-18 10:19:34 +11:00
stk
8cad8cda8f
Don't bother setting view cursor pos for staging/stagingSecondary views
...
Now that the cursor highlight is never shown (see previous commit), there's no
reason to update the cursor position any more.
2023-02-15 21:32:21 +01:00
stk
6b81e6adca
Turn highlighting off in staging/stagingSecondary views
...
There are two reasons for doing this:
1. The view cursor position is often out of sync with the selected line; see
first commit of this branch.
2. The highlighting is already turned off when the view loses focus, and never
turned back on thereafter. So just turn it off from the start then.
2023-02-15 21:29:38 +01:00
stk
b499eba1a8
Select next stageable line correctly after staging a range of lines
...
We already have this very convenient behavior of jumping to the next stageable
line after staging something. However, while this worked well for staging
single lines or hunks, it didn't work correctly when staging a range of lines;
in this case we want to start searching from the first line of the range.
2023-02-15 21:29:00 +01:00
stk
97daec7228
Add test demonstrating selection bug when staging a range of lines
...
The selected line is not in the right position after staging a range of lines;
see next commit.
2023-02-15 21:28:05 +01:00
stk
ff2a799200
Make SelectedLine/SelectedLineIdx work in staging/stagingSecondary views
...
While we try to keep the view's cursor position in sync with the context state's
selectedLineIdx (at least when pressing up or down), there are enough situations
where the two run out of sync; for example when initially opening the view, or
after staging a hunk, or when scrolling the view using the wheel. While it would
be possible to fix these situations to keep them always in sync, it doesn't seem
worth it, because the view's cursor position isn't really used for anything
else. So we rather special-case the SelectedLine/SelectedLineIdx functions of
ViewDriver to query the context state's selectedLineIdx directly if it is a
patch explorer context.
2023-02-15 21:22:11 +01:00
Jesse Duffield
31fcec16d9
Merge pull request #2429 from stefanhaller/do-not-autosquash-in-regular-rebase
2023-02-15 20:21:08 +11:00
README-bot
0d395e4051
Updated README.md
2023-02-14 09:54:05 +00:00
Jesse Duffield
09178a1276
Merge pull request #2435 from Ryooooooga/return-alt1
2023-02-14 20:53:42 +11:00
Jesse Duffield
b66aa42ee5
Merge pull request #2437 from jesseduffield/migrate-even-more-tests
2023-02-12 18:16:22 +11:00
Jesse Duffield
3cfdae4116
migrate submodule reset test
2023-02-12 18:12:01 +11:00
Jesse Duffield
d7956c481d
migrate submodule enter test
2023-02-12 18:12:01 +11:00
Jesse Duffield
7a3291a1f7
fix test
2023-02-12 18:12:01 +11:00
Jesse Duffield
08c2b46d04
better visibility for tui
2023-02-12 10:47:45 +11:00
Jesse Duffield
1c48842277
migrate submodule remove test
2023-02-12 10:47:45 +11:00
Jesse Duffield
010f6d7f6e
migrate submodule add test
2023-02-12 10:47:41 +11:00
Ryooooooga
39c20bc634
chore: change to work return-alt1 on all views
2023-02-11 21:19:47 +09:00
Jesse Duffield
823d95a8c6
Merge pull request #2418 from jesseduffield/feature/copy-remote-branch-to-clipboard
2023-02-11 10:53:31 +11:00
Jesse Duffield
225cd3cc60
Merge pull request #2412 from Ryooooooga/disable-help-on-suggestions
2023-02-11 10:52:49 +11:00
README-bot
91d62da577
Updated README.md
2023-02-10 23:52:06 +00:00
Jesse Duffield
9f71ed6c41
Merge pull request #2432 from Ryooooooga/remove-unknown-view-error-msg
2023-02-11 10:51:49 +11:00
Ryooooooga
984eb95cb7
chore: remove UNKNOWN_VIEW_ERROR_MSG
2023-02-10 21:26:51 +09:00
stk
1da762c295
Explicitly pass --no-autosquash when rebasing
...
This fixes the problem shown in the previous commit.
2023-02-09 18:21:11 +01:00
