Jesse Duffield
c703cd8f88
fix suggestions panel
2022-03-17 19:13:40 +11:00
Jesse Duffield
0a8cff6ab6
some more refactoring
2022-03-17 19:13:40 +11:00
Jesse Duffield
e2f5fe1016
pretty sure we can rely on our views existing before our contexts do
2022-03-17 19:13:40 +11:00
Jesse Duffield
182c999ee0
fix linting
2022-03-17 19:13:40 +11:00
Jesse Duffield
b5515da00b
move commit files context into new structure
2022-03-17 19:13:40 +11:00
Jesse Duffield
c084abb378
move more view model logic into the files view model
2022-03-17 19:13:40 +11:00
Jesse Duffield
8ea7b7a62e
migrate files context to new structure
2022-03-17 19:13:40 +11:00
Jesse Duffield
09dc160da9
cleaning up
2022-03-17 19:13:40 +11:00
Jesse Duffield
e187293456
moving more into controllers package
2022-03-17 19:13:40 +11:00
Jesse Duffield
b04038d08f
no need to invoke sync controller here
2022-03-17 19:13:40 +11:00
Jesse Duffield
55b393c929
always fast forward
2022-03-17 19:13:40 +11:00
Jesse Duffield
f0c81ea6dc
remove redundant popup checks
2022-03-17 19:13:40 +11:00
Jesse Duffield
f97de692e3
move helpers into their own struct
2022-03-17 19:13:40 +11:00
Jesse Duffield
2692637fbe
standardise naming
2022-03-17 19:13:40 +11:00
Jesse Duffield
77d0732fa8
add actions abstraction
2022-03-17 19:13:40 +11:00
Jesse Duffield
51547e3822
move all refresh code into the one file
2022-03-17 19:13:40 +11:00
Jesse Duffield
e363606fb6
move context keys into context package
2022-03-17 19:13:40 +11:00
Jesse Duffield
138be04e65
refactor contexts code
2022-03-17 19:13:40 +11:00
Jesse Duffield
1a74ed3214
avoid deadlock
2022-03-17 19:13:40 +11:00
Jesse Duffield
cb0d3a480a
use type switch instead of type key
2022-03-17 19:13:40 +11:00
Jesse Duffield
a2318d75b5
fix some things
2022-03-17 19:13:40 +11:00
Jesse Duffield
1dd7307fde
start moving commit panel handlers into controller
...
more
and more
move rebase commit refreshing into existing abstraction
and more
and more
WIP
and more
handling clicks
properly fix merge conflicts
update cheatsheet
lots more preparation to start moving things into controllers
WIP
better typing
expand on remotes controller
moving more code into controllers
2022-03-17 19:13:40 +11:00
Jesse Duffield
a90b6efded
start refactoring gui
2022-03-17 19:13:40 +11:00
Jesse Duffield
fa8571e1f4
rename field
2022-03-17 19:01:28 +11:00
David Roman
d8d0d4686d
Only read env once when recording dirs
2022-03-17 19:01:28 +11:00
David Roman
b8fc829f86
Record current directory on switch
2022-03-17 19:01:28 +11:00
Ram Bhosale
7be25a105d
allow skipping confirmation prompt after opening subprocess
2022-03-17 17:52:31 +11:00
Francisco Miamoto
ca8180e1b7
Use editFileAtLine method for line by line panel
2022-03-16 20:43:53 +11:00
Daniel Kiss
f5a5b7f966
Add unstagedChangesColor config option
2022-03-16 19:21:39 +11:00
Matt Cles
9adf4a1908
Add shared function for loading map of custom colors
2022-02-01 18:55:45 +11:00
Matt Cles
4df7646654
Add configurable colors for branch prefixes
...
Branches can now be colored based on their prefix, if it matches
a user defined prefix in the config file. If no user defined
prefix matches, then it will fallback to the defaults: green for
'feature', yellow for 'bugfix', and red for 'hotfix'. All
remaining branches will be set to the default text color.
2022-02-01 18:55:45 +11:00
Jesse Duffield
1b09674ce8
simplify submodule remove
2022-01-29 00:17:32 +11:00
Jesse Duffield
d13a648132
ensure stash panel refreshes
2022-01-28 20:07:30 +11:00
Jesse Duffield
84a1992055
better locking of merge panel state
2022-01-27 21:25:04 +11:00
Jesse Duffield
fa2e7ae1e7
show only merge conflict files when there are merge conflicts
2022-01-26 20:28:32 +11:00
Jesse Duffield
5a3f81d1f7
select current bisect commit even if bisect was started on another branch
2022-01-26 19:29:17 +11:00
Jesse Duffield
ebbdf829e7
fix panic on rebase
2022-01-26 17:20:58 +11:00
Jesse Duffield
5e9cfab283
better rendering of bisect markets in commits panel
2022-01-26 16:52:20 +11:00
Jesse Duffield
ca7cfc3232
only show commits from start ref if bad commit is reachable from there
2022-01-26 16:52:20 +11:00
Jesse Duffield
c8cc18920f
improve merge conflict flow
2022-01-26 14:50:47 +11:00
glendsoza
eb57e3ead0
Fixed the issue with linting
2022-01-26 09:04:12 +11:00
glendsoza
0caa391c4d
Changes as per review
2022-01-26 09:04:12 +11:00
glendsoza
0c6bdac2f7
Changes as per review
2022-01-26 09:04:12 +11:00
glendsoza
257e222f8d
ISSUE 1706: Ask confirmation before reverting a commit
2022-01-26 09:04:12 +11:00
Jesse Duffield
58bdcbf1dd
always refresh after stash action
2022-01-24 19:18:09 +11:00
Jesse Duffield
61ccc1efd2
exclude interactive rebase TODO commits from commit graph
2022-01-22 15:12:24 +11:00
Jesse Duffield
5b7dd9e43c
properly resolve cyclic dependency
2022-01-22 10:48:51 +11:00
Jesse Duffield
4ab5e54139
add support for git bisect
2022-01-22 10:48:51 +11:00
Birger Skogeng Pedersen
ab84410b41
check returned error (if any) from UpdateWindowTitle
2022-01-21 23:13:39 +11:00
Birger Skogeng Pedersen
62a7d9bbcc
invoke title-setting shell command appropriately
2022-01-21 23:13:39 +11:00
Birger Skogeng Pedersen
555d8bbc96
set repo name as window title when loading repo, fix #1691
2022-01-21 23:13:39 +11:00
Jesse Duffield
b6fb7f1365
fix integration test
2022-01-18 21:25:52 +11:00
Jesse Duffield
d019626342
do not show branch graph when in filtering mode
2022-01-17 22:00:53 +11:00
Jesse Duffield
595aca2a4b
make integration test pass
2022-01-17 19:14:59 +11:00
Jesse Duffield
2691477aff
allow sandbox mode with integration tests
2022-01-17 19:14:59 +11:00
Jesse Duffield
99035959a1
fix merge scroll bug
2022-01-16 23:16:05 +11:00
Jesse Duffield
0092c9d08d
fix bug with subprocess
2022-01-16 03:32:09 +00:00
Jesse Duffield
befa35645e
fix bug which prevented quitting with confirm
2022-01-15 20:35:25 +11:00
Jesse Duffield
1c84f77319
always specify upstream when pushing/pulling
2022-01-15 15:34:01 +11:00
Jesse Duffield
8d8bdb948b
avoid deadlock in merge panel
2022-01-15 14:15:41 +11:00
Jesse Duffield
cdcfeb396f
stop refreshing the screen so much
2022-01-15 14:15:41 +11:00
Jesse Duffield
8263d15b03
fix issue where custom command would not open a menu
2022-01-15 10:14:19 +11:00
Jesse Duffield
2436ff197a
fewer panics
2022-01-09 14:14:47 +11:00
Jesse Duffield
e5096e71ab
add integration test for discarding old files
2022-01-09 14:14:47 +11:00
Jesse Duffield
ceb927fec0
fix formatting
2022-01-09 14:14:47 +11:00
Jesse Duffield
0dfd02c42d
allow rewording old commits
2022-01-09 14:14:47 +11:00
Jesse Duffield
ee15202207
add newline after message because it looks like the message doesn't appear otherwise for some reason
2022-01-09 14:09:53 +11:00
Jesse Duffield
18f48a43d5
add some more linters
2022-01-09 14:09:53 +11:00
Jesse Duffield
fdf79fdeee
fix bug that caused credentials popup to be raised unexpectedly
2022-01-09 14:09:53 +11:00
Jesse Duffield
0dd1c12e2f
fix format issue
2022-01-09 14:09:53 +11:00
Jesse Duffield
364c5db19c
shorten name
2022-01-09 14:09:53 +11:00
Jesse Duffield
c9a0cc6b30
refactor
2022-01-09 14:09:53 +11:00
Jesse Duffield
3621854dc7
fix tests
2022-01-09 14:09:53 +11:00
Jesse Duffield
ee8ff6512f
trim down gitcommand struct some more
2022-01-09 14:09:53 +11:00
Jesse Duffield
610e503296
refactor git flow
2022-01-09 14:09:53 +11:00
Jesse Duffield
e92076d2c2
start removing direct calls to cmd.New from gui
2022-01-09 14:09:53 +11:00
Jesse Duffield
3f44eac95b
remove repo field
2022-01-09 14:09:53 +11:00
Jesse Duffield
946a35b59d
remove OSCommand field
2022-01-09 14:09:53 +11:00
Jesse Duffield
f503ff1ecb
start breaking up git struct
2022-01-09 14:09:53 +11:00
Jesse Duffield
48a4565d1f
remove log of error now that we're returning it normally
2022-01-07 11:01:42 +11:00
Jakob Kogler
ee7a6391a8
remove redundant commit
2022-01-07 11:01:42 +11:00
Jakob Kogler
68fc6059d3
rename variable to failedCommitMessage
2022-01-07 11:01:42 +11:00
Jakob Kogler
f981255a5b
don't ignore error when commit with subprocess fails
...
If signing by GPG is enabled, the git commit command will be executed in
a subprocess, differently from when it is executed without GPG signing.
In case of an error, e.g. a failing pre-commit hook, the error needs to
be passed along, and not just ignored.
2022-01-07 11:01:42 +11:00
Jakob Kogler
beedc2553d
remember the message if commit fails
...
In case a commit fails, e.g. because a pre-commit hook returns an error,
lazygit will now remember the commit message and will suggest it during
the next commit (e.g. after fixing the error of the pre-commit hook).
2022-01-07 11:01:42 +11:00
Jesse Duffield
0d3e5e6a1d
simplify fetch
2022-01-07 10:52:51 +11:00
Jesse Duffield
93729ba61b
fix some things
2022-01-07 10:52:51 +11:00
Jesse Duffield
91fe68576c
refactor
2022-01-07 10:52:51 +11:00
Jesse Duffield
05fa483f48
simplify how we log commands
2022-01-07 10:52:51 +11:00
Jesse Duffield
6da6c1f2f2
small copy changes
2022-01-04 09:07:15 +11:00
Jesse Duffield
c82606a92a
fix broken format call
2022-01-04 09:07:15 +11:00
Jesse Duffield
194ff1630c
do dependency injection up front and in one place
2022-01-04 09:07:15 +11:00
Jesse Duffield
9c4a819683
refactor sync test
2022-01-04 09:07:15 +11:00
Jesse Duffield
547e0153ec
stash and tags loaders
2022-01-04 09:07:15 +11:00
Jesse Duffield
44b6d26b10
move remotes loader into loaders package
2022-01-04 09:07:15 +11:00
Jesse Duffield
d69ce7a529
move reflog commit loader into loaders package
2022-01-04 09:07:15 +11:00
Jesse Duffield
9b2b0fc122
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
96c2887fd0
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
66e840bc3f
more refactoring
2022-01-04 09:07:15 +11:00
Jesse Duffield
b028f37ba8
updating specs
2022-01-04 09:07:15 +11:00
Jesse Duffield
1fc0d786ae
better typing for rebase mode
2022-01-04 09:07:15 +11:00
Jesse Duffield
43a4fa970d
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
192a548c99
refactoring the config struct
2022-01-04 09:07:15 +11:00
Jesse Duffield
01ea5813a8
align Gui struct with GitCommand
2022-01-04 09:07:15 +11:00
Jesse Duffield
18ab086126
introduce Common struct for passing around common stuff
2022-01-04 09:07:15 +11:00
Jesse Duffield
b4c078d565
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
9ef65574db
refactor to rename pull_request to hosting_service and apply SRP
2021-12-29 09:01:06 +11:00
Jesse Duffield
f89747451a
allow opening a commit in the browser
2021-12-29 09:01:06 +11:00
Francisco Miamoto
8a76b5a4ee
use custom handler only for branch commits context
2021-12-28 15:54:19 +11:00
Francisco Miamoto
1a7d0cd7ae
add binding to go to bottom on lists
...
Related to #1584
2021-12-28 15:54:19 +11:00
Francisco Miamoto
8c8b925b3a
set tag index directly
...
We can do this since they are already sorted by date created.
2021-12-26 17:08:31 +11:00
Francisco Miamoto
eff6c4283b
change formatting for menu items
2021-12-26 17:08:31 +11:00
Francisco Miamoto
7888ff6cb9
set show cancel as true for tag menu
2021-12-26 17:08:31 +11:00
Francisco Miamoto
e7a005f44d
update translations to match conventions
2021-12-26 17:08:31 +11:00
Francisco Miamoto
3e58797096
show tag menu for creation on tags tab
2021-12-26 17:08:31 +11:00
Francisco Miamoto
b1d6ccddfb
support creating annotated tags
2021-12-26 17:08:31 +11:00
Marius Bergmann
38743ec99f
Suggest existing remote for non-tracking branch
...
Currently, when pushing or pulling a branch that has no tracking remote,
lazygit suggests the (hard-coded) remote named 'origin'. However, a
repository might not have a remote with this name, in which case the
suggestion makes no sense. This happens to me quite regularly when I
choose a more meaningful name than 'origin' for a remote.
This change keeps the current behavior by suggesting 'origin' when there
is either a remote with that name or no remote at all. However, when
'origin' does not exist, the name of the first remote is suggested.
Suggest existing remote for non-tracking branch
Currently, when pushing or pulling a branch that has no tracking remote,
lazygit suggests the (hard-coded) remote named 'origin'. However, a
repository might not have a remote with this name, in which case the
suggestion makes no sense. This happens to me quite regularly when I
choose a more meaningful name than 'origin' for a remote.
This change keeps the current behavior by suggesting 'origin' when there
is either a remote with that name or no remote at all. However, when
'origin' does not exist, the name of the first existing remote is
suggested.
2021-12-26 15:47:58 +11:00
Mark Sagi-Kazar
fdf0d4a2c3
implement signoff
...
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
2021-12-25 12:01:55 +11:00
Cokile
76e6745526
fix typo
2021-12-25 11:54:27 +11:00
Cokile
3771f9c98b
support config unified color for commit authors
2021-12-25 11:54:27 +11:00
Jesse Duffield
18283ad41b
add popup handler for easier testing
2021-12-06 22:37:28 +11:00
Jesse Duffield
1996eddd91
more efficient context diff size changing
2021-12-06 22:37:28 +11:00
DerTeta
de0e885c65
Refresh staging- or patch building panel when rendering their respective context
2021-12-06 22:37:28 +11:00
DerTeta
f7ffbbd72a
Add a menu entry and keybinding to { for decreasing the context size
2021-12-06 22:37:28 +11:00
DerTeta
0fbde05928
Add a menu item and keybinding to } to increase the context size
2021-12-06 22:37:28 +11:00
DerTeta
ba844c18a5
Add the DecreaseContextInDiffView function
2021-12-06 22:37:28 +11:00
DerTeta
e1cf6912db
Add the IncreaseContextInDiffView function
2021-12-06 22:37:28 +11:00
DerTeta
3e3151f86a
Fix: Don't access a view if it's nil
...
The way the `if` expression in `deactivateContext` was composed,
it was possible to have it to evaluate to `true` even though the
`view` variable was `nil`.
As far as I can tell, this seems to be only possible during tests.
Nonetheless, I think the expression looks more "correct" this way.
2021-12-06 22:37:28 +11:00
Jesse Duffield
02bf6a5c17
fix delta again
2021-11-22 21:07:04 +11:00
Jesse Duffield
2f45db8f7c
fix scrolling in sub commits panel
2021-11-10 08:54:14 +11:00
Jesse Duffield
1d40d03bb2
refactor
2021-11-05 07:58:21 +11:00
Jesse Duffield
9a9e3d506d
more consistent rendering
2021-11-05 07:58:21 +11:00
Jesse Duffield
06ca71e955
fix bug
2021-11-05 07:58:21 +11:00
Jesse Duffield
ccd80a0e4b
add menu options for log stuff
2021-11-05 07:58:21 +11:00
Jesse Duffield
37be9dbea1
support scrolling left and right
2021-11-05 07:58:21 +11:00
Jesse Duffield
f6ec7babf5
add some config
2021-11-05 07:58:21 +11:00
Jesse Duffield
802cfb1a04
render commit graph
2021-11-05 07:58:21 +11:00
Jesse Duffield
2fc1498517
some refactoring in anticipation of the graph feature
2021-11-01 10:03:49 +11:00
Jesse Duffield
7a464ae5b7
add graph algorithm
2021-11-01 10:03:49 +11:00
Jesse Duffield
927ee63106
support aborting a merge or rebase with esc
2021-11-01 09:18:30 +11:00
Jesse Duffield
c47c539e12
support user-configurable author colours
2021-10-30 18:26:06 +11:00
Jesse Duffield
7561703e8d
move author name colouring code into its own file
2021-10-30 18:26:06 +11:00
Jesse Duffield
e122f421e6
only use a single initial for double sized runes
2021-10-30 18:26:06 +11:00
Ryooooooga
6171690b00
Fix multibyte initial characters
2021-10-30 18:26:06 +11:00
Jesse Duffield
253504a094
associate random colours with authors
2021-10-30 18:26:06 +11:00
Jesse Duffield
f704707d29
stream output from certain git commands in command log panel
2021-10-30 18:26:06 +11:00
Jesse Duffield
01d82749b1
fix commit message prefix thingo
2021-10-25 22:40:15 +00:00
Jesse Duffield
3eb124c732
easier hiding of command log
2021-10-23 12:54:57 +11:00
Jesse Duffield
ef544e6ce9
add more suggestions
2021-10-23 12:29:52 +11:00
Jesse Duffield
629494144f
show suggestions when typing in an origin
2021-10-23 12:29:52 +11:00
Jesse Duffield
b6a5e9d615
use cached git config
2021-10-23 10:26:47 +11:00
