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

31 Commits

Author SHA1 Message Date
60f902f026 rename patch manager to patch builder 2023-03-19 16:35:57 +11:00
6bd1c1d068 Remove parameters that are no longer needed
All callers in this file now use reverseOnGenerate=false and
keepOriginalHeader=true, so hard-code that in the call to ModifiedPatchForLines
and get rid of the parameters.
2023-03-07 09:49:34 +01:00
9cc33c479b Use forward patches and --reverse flag for partial patches too
There's no reason to have two different ways of applying patches for whole-file
patches and partial patches; use --reverse for both. Not only does this simplify
the code a bit, but it fixes an actual problem: when reverseOnGenerate and
keepOriginalHeader are both true, the generated patch header is broken (the two
blobs in the line `index 6d1959b..6dc5f84 100644` are swapped). Git fails to do
a proper three-way merge in that case, as it expects the first of the two blobs
to be the common ancestor.

It would be possible to fix this by extending ModifiedPatchForLines to swap the
two blobs in this case; but this would prevent us from concatenating all patches
and apply them in one go, which we are going to do later in the branch.
2023-03-07 09:49:34 +01:00
c36333af3d Merge pull request #2433 from Ryooooooga/subcommits-limit 2023-03-06 18:22:57 +11:00
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
a624e0457f feat(subcommits): load unlimited sub-commits 2023-02-27 15:29:00 +09:00
c517d1e0a2 update view cursor when selecting new line in patch explorer view 2023-02-18 10:19:34 +11:00
stk
5bb6198219 Allow ignoring whitespace in diff in commits panel 2023-02-07 12:14:29 +01:00
3e73dacce3 Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
d73a236d7c allow rendering to main panels from anywhere 2022-08-07 12:05:51 +10:00
7410acd1aa move merge conflicts code into controller 2022-08-07 11:16:03 +10:00
445a625b56 rename merging context to mergeConflicts 2022-08-06 18:05:00 +10:00
524bf83a4a refactor to only have one context per view 2022-08-06 13:49:11 +10:00
b838b74801 do not highlight line if there are no items to display 2022-04-16 15:19:32 +10:00
4835fc00b8 introduce Ref interface 2022-04-02 17:04:42 +11:00
ad7703df65 show namesake for child views 2022-03-26 18:00:46 +11:00
13b90ac37f support viewing commits of reflog entry and show better view title 2022-03-26 18:00:46 +11:00
1b75ed3740 many 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
371b8d638b more consistent naming 2022-03-17 19:13:40 +11:00
722410aded refactor controllers 2022-03-17 19:13:40 +11:00
b93b8cc00a controller for viewing sub commits 2022-03-17 19:13:40 +11:00
d82f175e79 refactor contexts 2022-03-17 19:13:40 +11:00
482bdc4f1e more refactoring 2022-03-17 19:13:40 +11:00
2a1e3faa0c resetting controllers on new repo 2022-03-17 19:13:40 +11:00
0a8cff6ab6 some more refactoring 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
51547e3822 move all refresh code into the one file 2022-03-17 19:13:40 +11:00