Humble Penguin
dfe5c805c4
generated cheatsheets and ran code formatting
2023-03-05 07:06:34 +05:00
Humble Penguin
e94ff63bc5
issue #2473
2023-03-05 06:47:21 +05: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
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
Jesse Duffield
c34e0deca7
Merge pull request #2478 from stefanhaller/make-test-more-robust
2023-03-01 18:28:23 +11: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
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
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
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
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
c63fed2074
migrate staging tests
2023-02-23 22:29:40 +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
78f3a7a478
migrate interactive rebase integration tests
2023-02-22 19:36:31 +11:00
Jesse Duffield
526c9dea9b
Merge pull request #2293 from jesseduffield/feature/make-discarding-harder
2023-02-21 22:03:25 +11:00
Jesse Duffield
bfde06d049
migrate push tests
2023-02-21 21:50:03 +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
Luka Markušić
31b8524fe6
Add tooltips for discarding
2023-02-20 19:28:45 +11:00
Luka Markušić
0ae34aeeb7
Make discarding items less error prone
...
The menu is opened by `d` so this makes it harder to mess things up by
accidentally pressing `dd`.
2023-02-20 19:28:45 +11:00
Jesse Duffield
e1c376ef54
Merge pull request #2453 from stefanhaller/allow-rebasing-to-first-commit
2023-02-20 19:21:37 +11:00
Jesse Duffield
0b55eaca1d
add create tag from commit test
2023-02-20 19:01:08 +11:00
Jesse Duffield
ee8c31880c
add reset to tag test
2023-02-20 19:01:08 +11:00
Jesse Duffield
daf8176dd7
add tag checkout test
2023-02-20 19:01:08 +11:00
Jesse Duffield
082d342bf8
add tag tests
2023-02-20 19:01:08 +11:00
Jesse Duffield
39c56553b3
show tag message
2023-02-20 19:01:08 +11:00
Stefan Haller
c5cd217a65
Allow squashing fixups above the first commit of a repo
...
This includes amending changes into a given commit, since that's implemented in
terms of the former.
2023-02-20 08:29:43 +01:00
Jesse Duffield
9e2a3a87dd
improved commit test
2023-02-20 18:20:23 +11:00
Jesse Duffield
ac580ae6a0
migrate undo2
2023-02-20 18:20:23 +11:00
Jesse Duffield
9e1e20fef2
Merge pull request #2421 from Ryooooooga/tag-on-branch
2023-02-20 18:20:16 +11:00
Jesse Duffield
4b49bd406f
Update pkg/integration/tests/branch/create_tag.go
2023-02-20 17:58:08 +11:00
Stefan Haller
7351907474
Add integration tests for rebasing to the initial commit
2023-02-20 07:40:05 +01:00
Stefan Haller
a349e886ce
Allow interactive rebasing all the way down to the first commit
...
Pass --root instead of a sha when we want to rebase down to the initial commit.
2023-02-20 07:40:05 +01:00
Stefan Haller
dd61c49a15
Better error message for trying to squash or fixup the first commit
...
It's not so much the total number of commits that matters here, it's just
whether we are on the first one. (This includes the other condition.)
This allows us to get rid of the condition in rebase.go.
2023-02-20 07:40:04 +01:00
Stefan Haller
ac9515d8c7
Revert "fix: improve backward compatibility"
...
Since we now require git 2.20, we don't need this any more.
This reverts commit 7c5f33980f
2023-02-19 16:13:31 +01:00
Ryoga
72a92d748f
test: fix TagNamesAt
...
Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>
2023-02-19 23:35:38 +09:00
Ryooooooga
36c2b00336
test: add an integration test for creating tag on branches
2023-02-19 23:35:38 +09:00
