f8c9ce33c2
move more actions into controller
2023-04-30 13:19:53 +10:00
71753770ad
move custom patch options menu action to controllers package
2023-04-30 13:19:53 +10:00
820b1e811d
move custom command action into its own file
2023-04-30 13:19:53 +10:00
4a33fede7b
move window arrangement helper
2023-04-30 13:19:53 +10:00
db12853bbe
lots of changes
2023-04-30 13:19:53 +10:00
711674f6cd
standardise controller helper methods
2023-04-30 13:19:53 +10:00
fc91ef6a59
standardise helper args
2023-04-30 13:19:53 +10:00
43251e7275
split context common from helper common
2023-04-30 13:19:53 +10:00
f081358943
move getDisplayStrings funcs into contexts
2023-04-30 13:19:53 +10:00
0c6ab4b43e
refactor cherry pick code to move state access out of helper
2023-04-30 13:19:53 +10:00
1b2fb34ffd
start moving getDisplayStrings funcs into contexts
2023-04-30 13:19:53 +10:00
0e5a4c7a36
move getModel functions into contexts
2023-04-30 13:19:53 +10:00
47b91f1ef5
move views into contexts
2023-04-30 13:19:53 +10:00
e2db6a1732
remove context callback opts
2023-04-30 13:19:53 +10:00
509e3efa70
lots more refactoring
2023-04-30 13:19:53 +10:00
8edad826ca
Begin refactoring gui
...
This begins a big refactor of moving more code out of the Gui struct into contexts, controllers, and helpers. We also move some code into structs in the
gui package purely for the sake of better encapsulation
2023-04-30 13:19:52 +10:00
826128a8e0
Merge pull request #2578 from jesseduffield/enforce-lowercase-filenames
2023-04-29 13:08:06 +10:00
aec46942a8
enforce lowercase filenames
2023-04-29 13:05:05 +10:00
aa70723e3a
Merge pull request #2558 from stefanhaller/allow-resetting-author-during-rebase
2023-04-29 12:44:14 +10:00
7db54a948a
Merge pull request #2548 from AKARSHITJOSHI/fix/tagPush
2023-04-29 12:43:55 +10:00
32556480da
Updated README.md
2023-04-29 02:39:27 +00:00
2553015029
Merge pull request #2577 from jbrains/add-editor-preset-for-kakoune
2023-04-29 12:39:10 +10:00
6c010a788c
Add an editor preset for kakoune (kakoune.org).
2023-04-27 13:41:54 -03:00
b17c38befd
Merge pull request #2567 from jesseduffield/bump-clipboard-package
2023-04-24 13:42:18 +10:00
79dc1d9052
Merge pull request #2557 from noahziheng/feature/add-gitea-pr
2023-04-24 13:42:05 +10:00
28d2b1432b
Updated README.md
2023-04-24 03:37:27 +00:00
ed98e11fa0
Merge pull request #2555 from Ryooooooga/revert-force-if-includes
2023-04-24 13:37:14 +10:00
07a22e69e7
bump clipboard package for WSL support
2023-04-24 13:33:27 +10:00
bf3dd79b7a
feat: add gitea to hosting service
2023-04-18 16:16:09 +00:00
21072226d2
Don't allow resetting non-HEAD commits (including rebase todos) during rebase
2023-04-18 17:34:07 +02:00
b09000194a
Allow resetting author of HEAD commit during rebase
2023-04-18 17:33:33 +02:00
3546ab8f21
Revert "feat: support for push --force-if-includes"
...
This reverts commit e00f248cf7
2023-04-17 19:37:33 +09:00
9a13447b97
Change push tag command
...
Signed-off-by: AKARSHITJOSHI <akarshitjoshi@gmail.com >
2023-04-16 10:37:11 +05:30
1efb565b22
Merge pull request #2370 from AzraelSec/rebase-with-todo-edit
2023-04-15 19:17:06 +10:00
08a445eb9d
test: check focus on commits after performing an advanced rebase
2023-04-15 11:01:55 +02:00
28501fbf77
chore: add focus on local commits after interactively rebase
2023-04-15 10:42:36 +02:00
8f1f712841
use lowercase text for menu items (as we're still yet to standardise on 'Sentence case')
2023-04-15 17:29:31 +10:00
b82b6a2992
test: add integration test to verify the interactive rebase correctly work
2023-04-15 17:26:08 +10:00
ddcd6be245
refactor: introduce a struct to pack the
...
`PrepareInteractiveRebaseCommand` function
2023-04-15 17:26:08 +10:00
711be78811
extract out function
2023-04-15 17:26:08 +10:00
3422b1e218
test: update the UI to follow the new rebase type selection instead of confirm the previous popup
2023-04-15 17:26:08 +10:00
a3fdf91714
feat: allow to perform a rebase with breaking before the first commit
2023-04-15 17:26:08 +10:00
368f9c8cb3
feat: let interactive rebase prepend commands to the default todo file
2023-04-15 17:26:08 +10:00
e18b4a4cc3
Updated README.md
2023-04-15 07:16:26 +00:00
46718e25ca
Merge pull request #2547 from stefanhaller/more-robust-todo-rewriting
2023-04-15 17:16:11 +10:00
d675eb6507
Don't allow changing the type of certain rebase todos
...
We already show "merge" todo entries when starting an interactive rebase with
--rebase-merges outside of lazygit. Changing the type of a merge entry to "pick"
or "edit" doesn't make sense and shouldn't be allowed. Earlier in this branch we
have started to show "update-ref" entries, these can't be changed either (they
can be moved, though).
You might argue that it should be possible to change them to "drop", but in the
case of "update-ref" this doesn't make sense either, because "drop" needs a Sha
and we don't have one here. Also, you would then be able to later change it back
to "pick", so we would have to remember that this isn't allowed for this
particular drop entry; that's messy, so just disallow all editing.
2023-04-15 08:36:03 +02:00
dc4e88f8a4
Make moving todo commits more robust
2023-04-15 08:36:03 +02:00
120dd1530a
Make EditRebaseTodo more robust
...
It used to work on the assumption that rebasing commits in lazygit's model
correspond one-to-one to lines in the git-rebase-todo file, which isn't
necessarily true (e.g. when users use "git rebase --edit-todo" at the custom
command prompt and add a "break" between lines).
2023-04-15 08:36:03 +02:00
860a8d102b
Add integration test for dropping a todo commit when there's an update-ref
...
The test shows how we are accidentally dropping the wrong commit in this case.
We'll fix that in the next commit.
2023-04-15 08:36:03 +02:00
a304fed68c
Add GitVersion field to NewIntegrationTestArgs
...
It can be used to specify which git versions a given test should or should not run on.
2023-04-15 08:36:03 +02:00
