Stefan Haller
572d1b5920
Add "Show divergence from upstream" entry to Upstream menu in branches panel
2023-08-29 08:16:40 +02:00
Stefan Haller
12f24aa8b4
Add option RefToShowDivergenceFrom to GetCommitsOptions
...
Not used yet.
2023-08-29 08:16:40 +02:00
Jesse Duffield
06be88aef7
Use fields rather than methods on worktrees
...
I would prefer to use methods to keep things immutable but I'd rather be consistent with the other
models and update them all at once
2023-07-30 18:35:24 +10:00
Jesse Duffield
de57cfd6ff
Remove IO logic from presentation code for worktrees
...
We're doing all the IO in our workers loader method so that we don't need to do any
in our presentation code
2023-07-30 18:35:24 +10:00
Jesse Duffield
a313b16704
Add more worktree tests
2023-07-30 18:35:23 +10:00
Jesse Duffield
7b05dacb98
Properly render worktrees in files panel
2023-07-30 18:35:22 +10:00
Jesse Duffield
ec839e9e96
Associate branches with worktrees even when mid-rebase
2023-07-30 18:35:22 +10:00
Jesse Duffield
c713d550c0
Improve name handling
2023-07-30 18:35:22 +10:00
Jesse Duffield
7682ec029b
Update worktree model
2023-07-30 18:35:22 +10:00
Joel Baranick
db02c13bf6
Address PR comments
2023-07-30 18:35:21 +10:00
Joel Baranick
54708233ac
Improve worktree panel
2023-07-30 18:35:21 +10:00
Joel Baranick
c679fd1924
Style missing worktree as red and display better error when trying to switch to them
...
Use a broken link icon for missing worktrees
2023-07-30 18:35:21 +10:00
Joel Baranick
f8ba899b87
Initial addition of support for worktrees
2023-07-30 18:35:21 +10:00
Jesse Duffield
3cee37388c
Keep track of authors across local commits and branch commits for suggestions
...
Previously, we would only show the authors based on local commits, but sometimes you want to set a commit author
to that of a commit on another branch. Now, so long as you've viewed the branch's commits, the author will appear
as a suggestion.
2023-07-22 10:47:04 +10:00
Jesse Duffield
13326344f0
Support filtering files
2023-07-03 12:54:13 +10:00
Stefan Haller
3928d0ebda
Insert fake todo entry for a conflicting commit that is being applied
...
When stopping in a rebase because of a conflict, it is nice to see the commit
that git is trying to apply. Create a fake todo entry labelled "conflict" for
this, and show the "<-- YOU ARE HERE ---" string for that one (in red) instead
of for the real current head.
2023-06-22 18:57:58 +02:00
Stefan Haller
5c55ce6555
Better prompt for discarding old file changes
...
Lazygit knows what kind of file change this is, so there doesn't have to be any
"if" in the prompt text.
2023-06-07 12:47:03 +02:00
Jesse Duffield
a4db44bc3d
show commits against branches
2023-06-01 19:21:24 +10:00
Stefan Haller
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
Stefan Haller
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
Stefan Haller
b24955063c
Allow rewording the head commit during interactive rebase
2023-04-01 08:16:15 +02:00
Jesse Duffield
39c56553b3
show tag message
2023-02-20 19:01:08 +11:00
Ryooooooga
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
Jesse Duffield
e8b97c9fe2
fix could-not-access error
2022-11-11 12:30:14 +11:00
Abirdcfly
d78d694959
chore: remove duplicate word in comments
...
Signed-off-by: Abirdcfly <fp544037857@gmail.com>
2022-08-30 13:23:37 +08:00
Jesse Duffield
a905165046
remove double negatives
2022-07-31 16:11:39 +10:00
Jesse Duffield
7077ea428f
add optimistic rendering for staging and unstaging files
2022-07-31 14:34:57 +10:00
Ryooooooga
61970a4439
fix: fix ambiguous refname
2022-05-13 21:05:51 +09:00
Jesse Duffield
e67fef776b
add author email to commits
2022-05-08 14:26:18 +10:00
Jesse Duffield
4dd09ee0d5
allow copying commit author to clipboard
2022-05-01 14:14:29 +10:00
Jesse Duffield
dfb293c985
better upstream changes presentation
2022-04-18 11:03:28 +10:00
Ryooooooga
53257db99d
fix: fix diff of renamed files
2022-04-06 08:26:13 +10:00
Ryooooooga
4835fc00b8
introduce Ref interface
2022-04-02 17:04:42 +11:00
Ryooooooga
30be50b641
add Commit.ParentRefName()
2022-04-02 17:04:42 +11:00
Jesse Duffield
dde30fa104
add gone branches status
2022-03-24 17:50:25 +11:00
Jesse Duffield
61ccc1efd2
exclude interactive rebase TODO commits from commit graph
2022-01-22 15:12:24 +11:00
Jesse Duffield
4ab5e54139
add support for git bisect
2022-01-22 10:48:51 +11:00
Jesse Duffield
1c84f77319
always specify upstream when pushing/pulling
2022-01-15 15:34:01 +11:00
Mark Kopenga
2eeff1257b
Merge pull request #1432 from black-desk/moved-submodule
...
fix moved submodule
2021-08-17 10:10:22 +02:00
Ryooooooga
a2f7fcd730
Remove unused constant
2021-08-16 23:21:46 +09:00
black_desk
bb4fe2653b
fix moved submodule
2021-08-13 17:03:37 +08:00
Jesse Duffield
9fdf92b226
more refactoring
...
WIP
WIP
2021-06-06 09:12:49 +10:00
Jesse Duffield
fb395bca6e
support reverting merge commits
2021-06-05 22:15:51 +10:00
Jesse Duffield
9e85d37fb9
refactor to no longer call these things file changes
2021-04-02 11:00:15 +11:00
Jesse Duffield
50c169e0a3
better colouring for directories for when adding a patch
2021-04-02 11:00:15 +11:00
Jesse Duffield
54910fdb76
refactor
2021-04-02 11:00:15 +11:00
Jesse Duffield
332a3c4cbf
file tree for commit files
2021-04-02 11:00:15 +11:00
Jesse Duffield
d5639e6e95
refactor
2021-03-30 21:57:00 +11:00
Jesse Duffield
9e67f74ca3
prevent staging directory containing files with inline merge conflicts
2021-03-30 21:57:00 +11:00
Jesse Duffield
d2e1b35eee
small fixes
2021-03-30 21:57:00 +11:00
