1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-27 00:51:18 +02:00
Commit Graph

114 Commits

Author SHA1 Message Date
227b0b781c Show update-ref commands in rebase todo list
This is useful when working with stacked branches, because you can now move
"pick" entries across an update-ref command and you can tell exactly which
branch the commit will end up in.

It's also useful to spot situations where the --update-refs option didn't work
as desired. For example, if you duplicate a branch and want to rebase only one
of the branches but not the other (maybe for testing); if you have
rebase.updateRefs=true in your git config, then rebasing one branch will move
the other branch along. To solve this we'll have to introduce a way to delete
the update-ref entry (maybe by hitting backspace?); this is out of scope for
this PR, so for now users will have to type "git rebase --edit-todo" into the
custom command prompt to sort this out.

We will also have to prevent users from trying to turn update-ref commands into
other commands like "pick" or "drop"; we'll do this later in this branch.
2023-04-15 08:36:03 +02:00
740474c10c Visualize branch heads in commits panel
Useful when working with stacked branches.
2023-04-15 08:36:03 +02:00
c53c5e47ef Store commit.Action as an enum instead of a string
The main reason for doing this (besides the reasons given for Status in the
previous commit) is that it allows us to easily convert from TodoCommand to
Action and back. This will be needed later in the branch. Fortunately,
TodoCommand is one-based, so this allows us to add an ActionNone constant with
the value 0.
2023-04-15 08:36:03 +02:00
188773511e Store commit.Status as an enum instead of a string
This is unrelated to the changes in this PR, but since we are doing the same
thing for the commit.Action field in the next commit, it makes sense to do it
for Status too for consistency. Modelling this as an enum feels more natural
than modelling it as a string, since there's a finite set of possible values.
And it saves a little bit of memory (not very much, since none of the strings
were heap-allocated, but still).
2023-04-15 08:36:03 +02:00
549ce09f71 Fix deprecated rand.Seed 2023-03-19 10:00:19 +01:00
60f902f026 rename patch manager to patch builder 2023-03-19 16:35:57 +11:00
5c8bc790ff Make arrows consistent (#2501) 2023-03-18 11:32:44 +11:00
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
adef3bd4ca Add icon for Kotlin script files 2023-02-25 15:14:26 +01:00
c80a94aa7a Add icon for Kotlin files 2023-02-25 10:51:43 +01:00
39c56553b3 show tag message 2023-02-20 19:01:08 +11:00
52a2e4c1dc fix: fix ambiguous branch name
test: add an integration test for checkout branch by name

fix: fix full ref name of detached head

refactor: refactor current branch loader

chore: use field name explicitly
2022-11-14 19:05:07 +11:00
d90fedfbf8 feat: add stash icon 2022-10-14 21:58:58 +09:00
755ae0ef84 add deadlock mutex package
write to deadlock stderr after closing gocui

more deadlock checking
2022-08-07 11:16:14 +10:00
682be18507 refactor to use generics for file nodes
use less generic names
2022-07-31 19:43:14 +10:00
1f482e585e Fix github linter errors 2022-07-30 08:10:29 +02:00
e57931f56d test: fix timezone for time format tests 2022-05-18 20:55:29 +09:00
1f1d871837 feat: add ability to customize time format 2022-05-18 20:55:27 +09:00
e67fef776b add author email to commits 2022-05-08 14:26:18 +10:00
db3568e4f2 chore(gui): remove todo 2022-04-29 17:53:43 +09:00
86af186683 feat(file_icons.go): add Cargo.toml icons 2022-04-24 18:23:14 +09:00
f972d6ae68 feat(gui): show remote icons 2022-04-23 12:25:42 +09:00
11d0e7e17d feat(gui): show branch icons 2022-04-23 12:25:41 +09:00
cb13fe7f46 feat(gui): show commit icons 2022-04-23 12:25:41 +09:00
b07aeda5a6 feat(gui): show file icons 2022-04-23 12:25:40 +09:00
dfb293c985 better upstream changes presentation 2022-04-18 11:03:28 +10:00
00afa30ebf better appearance for reverse attribute 2022-04-16 15:19:32 +10:00
09d24ebd1d fix test 2022-04-02 17:04:42 +11:00
4835fc00b8 introduce Ref interface 2022-04-02 17:04:42 +11:00
94a53484a1 would you believe that I'm adding even more generics 2022-03-24 20:14:41 +11:00
1b75ed3740 many more generics 2022-03-24 20:14:41 +11:00
bf4f06ab4e more generics 2022-03-24 20:14:41 +11:00
eda8f4a5d4 lots more generics 2022-03-24 20:14:41 +11:00
c7a629c440 make more use of generics 2022-03-24 20:14:41 +11:00
dde30fa104 add gone branches status 2022-03-24 17:50:25 +11:00
5ded030a88 diff colour for reflog commits 2022-03-23 18:53:29 +11:00
a34bdf1a04 update linters 2022-03-19 12:12:57 +11:00
55af07a1bb fix CI 2022-03-17 19:13:40 +11:00
d82f175e79 refactor contexts 2022-03-17 19:13:40 +11:00
182c999ee0 fix linting 2022-03-17 19:13:40 +11:00
b5515da00b move commit files context into new structure 2022-03-17 19:13:40 +11:00
c084abb378 move more view model logic into the files view model 2022-03-17 19:13:40 +11:00
8ea7b7a62e migrate files context to new structure 2022-03-17 19:13:40 +11:00
f5a5b7f966 Add unstagedChangesColor config option 2022-03-16 19:21:39 +11:00
9adf4a1908 Add shared function for loading map of custom colors 2022-02-01 18:55:45 +11:00
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
ebbdf829e7 fix panic on rebase 2022-01-26 17:20:58 +11:00
5e9cfab283 better rendering of bisect markets in commits panel 2022-01-26 16:52:20 +11:00
ca7cfc3232 only show commits from start ref if bad commit is reachable from there 2022-01-26 16:52:20 +11:00
61ccc1efd2 exclude interactive rebase TODO commits from commit graph 2022-01-22 15:12:24 +11:00