1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-16 11:37:01 +02:00
Commit Graph

3934 Commits

Author SHA1 Message Date
README-bot
40a29fd622 Updated README.md 2023-03-03 10:06:38 +00:00
Jesse Duffield
648748781d
Merge pull request #2483 from stefanhaller/fix-setting-selectedLineBgColor 2023-03-03 21:06:19 +11:00
Stefan Haller
63e8b8c01c Fix setting gui.selectedRangeBgColor as a hex value 2023-03-03 08:46:43 +01:00
Stefan Haller
ed47529604 Add some tests for GetTextStyle
The tests show that setting a hex color doesn't work; we'll fix that in the next
commit.
2023-03-03 08:46:43 +01:00
Jesse Duffield
ff5d0155db
Merge pull request #2467 from jesseduffield/remove-file 2023-03-01 19:23:55 +11:00
Jesse Duffield
48acf3818f
Merge pull request #2479 from stefanhaller/fix-you-are-here-issues 2023-03-01 19:21:26 +11:00
Stefan Haller
de3e4838ad Store WorkingTreeState in model
This is the working tree state at the time the model commits were loaded. This
avoids a visual glitch with the "You Are Here" label appearing at times when it
is not supposed to.
2023-03-01 09:12:00 +01:00
Stefan Haller
6af8f278d0 Don't put "<--- YOU ARE HERE" in the commit model's name
Instead, derive it from context at display time (if we're rebasing, it's the
first non-todo commit). This fixes the problem that unfolding the current
commit's files in the local commits panel would show junk in the frame's title.

Along the way we make sure to only display the "<--- YOU ARE HERE" string in the
local commits panel; previously it would show for the top commit of a branch or
tag if mid-rebase.
2023-03-01 09:12:00 +01:00
README-bot
e3c6887e5d Updated README.md 2023-03-01 07:28:41 +00:00
Jesse Duffield
c34e0deca7
Merge pull request #2478 from stefanhaller/make-test-more-robust 2023-03-01 18:28:23 +11:00
README-bot
75b2c50a55 Updated README.md 2023-02-27 23:12:06 +00:00
Jesse Duffield
af7c71d1ee
Merge pull request #2476 from pereBohigas/feature/add_kotlin_icon 2023-02-28 10:11:47 +11:00
Stefan Haller
161bb684fa Make integration test more robust
If you ran this test enough times it would eventually fail; this happened
whenever the resulting squashed commit had a sha that happened to start with
"02". We test that "commit 02" does not appear in the diff window, but in that
case it did, at the very top of the window.

A better fix might be to change the commit message that we use in CreateNCommits
to something other than "commit XY", but that would require touching tons of
tests, so this is the easier fix.
2023-02-27 08:53:06 +01:00
README-bot
f2aa7e7e28 Updated README.md 2023-02-26 02:07:25 +00:00
Jesse Duffield
75aa339b4e
Merge pull request #2477 from jesseduffield/migrate-merge-conflict-tests 2023-02-26 13:07:11 +11:00
Jesse Duffield
45d45d2397 show file tree by default in integration tests 2023-02-26 13:01:51 +11:00
Jesse Duffield
f7e8b2dd71 cleanup integration test code 2023-02-26 12:54:13 +11:00
Jesse Duffield
8b5d59c238 remove legacy integration tests 2023-02-26 11:34:18 +11:00
Jesse Duffield
f82f4f6dbc disable auto-refresh in integration tests 2023-02-26 11:23:18 +11:00
Jesse Duffield
ff3c5d331e migrate merge conflict tests 2023-02-26 11:22:24 +11:00
Pere Bohigas
adef3bd4ca Add icon for Kotlin script files 2023-02-25 15:14:26 +01:00
README-bot
33f9f81c8c Updated README.md 2023-02-25 10:40:16 +00:00
Jesse Duffield
f6fafc65ee
Merge pull request #2475 from jesseduffield/migrate-patch-building-tests 2023-02-25 21:40:02 +11:00
Jesse Duffield
9c645088bf give CI longer wait times before failing assertions 2023-02-25 21:37:16 +11:00
Jesse Duffield
dd1bf629b8 migrate patch building tests 2023-02-25 21:37:16 +11:00
Pere Bohigas
c80a94aa7a Add icon for Kotlin files 2023-02-25 10:51:43 +01:00
README-bot
6c0b805137 Updated README.md 2023-02-25 00:45:44 +00:00
Jesse Duffield
8a69d994c0
Merge pull request #2474 from jesseduffield/improve-staging-tests 2023-02-25 11:45:29 +11:00
Jesse Duffield
037e957282 fix PullMergeConflict integration test 2023-02-25 11:39:24 +11:00
Jesse Duffield
db011d8e34 Improve staging panel integration tests 2023-02-25 11:35:41 +11:00
Jesse Duffield
752526c880
Merge pull request #2470 from jesseduffield/migrate-staging-tests 2023-02-23 22:38:01 +11:00
Jesse Duffield
c63fed2074 migrate staging tests 2023-02-23 22:29:40 +11:00
Jesse Duffield
1b52a0d83f
Merge pull request #2463 from Ryooooooga/bump-tcell 2023-02-23 20:20:31 +11:00
Jesse Duffield
909a3b6791 remove erroneously added file 2023-02-22 22:35:08 +11:00
Jesse Duffield
558ceb64c7
Merge pull request #2466 from jesseduffield/migrate-reflog-tests 2023-02-22 22:33:57 +11:00
Jesse Duffield
1034962c7e migrate more tests 2023-02-22 22:29:01 +11:00
Jesse Duffield
eabe7f462a migrate more tests 2023-02-22 21:57:32 +11:00
Jesse Duffield
22c10479d5 migrate reflog integration tests 2023-02-22 21:15:03 +11:00
Jesse Duffield
f0572238cb
Merge pull request #2465 from jesseduffield/migrate-rebase-tests 2023-02-22 19:40:12 +11:00
Jesse Duffield
78f3a7a478 migrate interactive rebase integration tests 2023-02-22 19:36:31 +11:00
Ryooooooga
90772e1eaa
build: bump tcell version 2023-02-21 21:53:55 +09:00
Jesse Duffield
526c9dea9b
Merge pull request #2293 from jesseduffield/feature/make-discarding-harder 2023-02-21 22:03:25 +11:00
Jesse Duffield
c244c8f231
Merge pull request #2462 from jesseduffield/migrate-push-tests 2023-02-21 21:56:18 +11:00
Jesse Duffield
bfde06d049 migrate push tests 2023-02-21 21:50:03 +11:00
Jesse Duffield
6b8abb7887
Merge pull request #2458 from jesseduffield/migrate-stash-tests 2023-02-20 22:11:47 +11:00
Jesse Duffield
2b6a109e38 migrate stash tests 2023-02-20 21:52:27 +11:00
Jesse Duffield
71a30155dc rerun test generator 2023-02-20 19:29:15 +11:00
Jesse Duffield
6ee20840b2 migrate switch tab from menu test 2023-02-20 19:28:52 +11:00
Jesse Duffield
56424eb1aa remove x keybinding for opening menu so we now only use '?' 2023-02-20 19:28:45 +11:00
Jesse Duffield
38c7030b0f mention path in tooltips 2023-02-20 19:28:45 +11:00