1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-19 00:28:03 +02:00
Commit Graph

6505 Commits

Author SHA1 Message Date
93b9e1bd19 migrate merge conflict undo test 2023-02-19 15:48:09 +11:00
a51f64814c show snapshot of lazygit when test fails for easier investigation 2023-02-19 15:48:09 +11:00
b5e325b0a4 migrate revert merge test 2023-02-19 15:48:09 +11:00
88c76868ba migrate initial open test 2023-02-19 15:48:09 +11:00
e471567b5d remove already migrated test 2023-02-19 15:48:09 +11:00
13ee0f0a5d migrate open to branches with cli arg test 2023-02-19 15:48:09 +11:00
76a1b501f2 migrate more force push tests 2023-02-19 15:48:09 +11:00
7201a91b69 remove unneeded config setting 2023-02-19 13:51:37 +11:00
31d796ee75 migrate forcePush integration test 2023-02-19 13:38:15 +11:00
0ac869a415 allow syncing tests from vscode 2023-02-19 13:38:07 +11:00
9da9143aed Merge pull request #2449 from jesseduffield/migrate-pull-tests 2023-02-19 12:49:49 +11:00
b0383ba73a update readme 2023-02-19 12:42:48 +11:00
a3096e720c migrate pullAndSetUpstream test 2023-02-19 12:42:48 +11:00
c599aaed51 migrate pull integration test 2023-02-19 11:48:21 +11:00
f999bbce7c add code generator for creating tests list 2023-02-19 11:48:09 +11:00
bff076c70a rename key to Pull 2023-02-19 11:42:00 +11:00
979c3d6278 Fix yellow/red coloring of pushed/unpushed commits in branch commits panel (#2448) 2023-02-19 10:13:46 +11:00
1fc8823825 Updated README.md 2023-02-18 23:11:27 +00:00
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
627cc285f7 Updated README.md 2023-02-17 23:34:46 +00:00
bee338f93b Merge pull request #2444 from stefanhaller/fix-selecting-next-stageable-line 2023-02-18 10:34:31 +11:00
01bf7f21e6 bump gocui 2023-02-18 10:28:09 +11:00
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
31fcec16d9 Merge pull request #2429 from stefanhaller/do-not-autosquash-in-regular-rebase 2023-02-15 20:21:08 +11:00
0d395e4051 Updated README.md 2023-02-14 09:54:05 +00:00
09178a1276 Merge pull request #2435 from Ryooooooga/return-alt1 2023-02-14 20:53:42 +11:00
b66aa42ee5 Merge pull request #2437 from jesseduffield/migrate-even-more-tests 2023-02-12 18:16:22 +11:00
3cfdae4116 migrate submodule reset test 2023-02-12 18:12:01 +11:00
d7956c481d migrate submodule enter test 2023-02-12 18:12:01 +11:00
7a3291a1f7 fix test 2023-02-12 18:12:01 +11:00
08c2b46d04 better visibility for tui 2023-02-12 10:47:45 +11:00
1c48842277 migrate submodule remove test 2023-02-12 10:47:45 +11:00
010f6d7f6e migrate submodule add test 2023-02-12 10:47:41 +11:00
39c20bc634 chore: change to work return-alt1 on all views 2023-02-11 21:19:47 +09:00
823d95a8c6 Merge pull request #2418 from jesseduffield/feature/copy-remote-branch-to-clipboard 2023-02-11 10:53:31 +11:00
225cd3cc60 Merge pull request #2412 from Ryooooooga/disable-help-on-suggestions 2023-02-11 10:52:49 +11:00
91d62da577 Updated README.md 2023-02-10 23:52:06 +00:00
9f71ed6c41 Merge pull request #2432 from Ryooooooga/remove-unknown-view-error-msg 2023-02-11 10:51:49 +11:00
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
stk
e357c00d4d Add an integration test showing a problem with autosquash during normal rebase
For users who have the rebase.autoSquash git config set to true, any regular
rebase will squash fixups in addition to rebasing. Not good -- we'll fix that in
the next commit.
2023-02-09 17:35:20 +01:00
1be6c522d8 fix: disable menu key binding while displaying popup 2023-02-09 20:13:41 +09:00
8af59c3e6e Copy remote branch name to clipboard 2023-02-09 11:56:12 +01:00
c713d19383 Merge pull request #2417 from stefanhaller/make_integration_tests_more_robust 2023-02-09 21:55:30 +11:00