summaryrefslogtreecommitdiffstats
path: root/pkg/gui/merge_panel.go
AgeCommit message (Collapse)Author
2021-11-05support scrolling left and rightJesse Duffield
2021-11-01support aborting a merge or rebase with escJesse Duffield
2021-08-25Fix translationsRyooooooga
2021-08-25Fix `pick all hunks`Ryooooooga
2021-08-25Support `git config merge.conflictStyle diff3`Ryooooooga
2021-04-18refactor merge panelJesse Duffield
2021-04-11full coverage for logging commandsJesse Duffield
2021-04-11better way of scrolling to a merge conflictJesse Duffield
2021-04-06more refactoringJesse Duffield
2021-04-06testJesse Duffield
type safe view access
2021-04-06refactorJesse Duffield
2021-04-06refactor of contexts and filteringJesse Duffield
2021-04-02better handling of scrolling for conflicted filesJesse Duffield
2021-04-02refactorJesse Duffield
2021-04-02add mutex to prevent crashes with merge conflictsJesse Duffield
2021-04-02big refactor to give our enums actual typesJesse Duffield
2020-11-28Start on supporting auto-suggestions when checking out a branchJesse Duffield
switch to other fuzzy package with no dependencies
2020-11-18fix lint errorsJesse Duffield
2020-10-10type i18nJesse Duffield
2020-10-10remove viperJesse Duffield
WIP
2020-09-26add in-built logging support for a better dev experienceJesse Duffield
2020-08-23fix focus change on merge popup returnJesse Duffield
2020-08-23use context to return to the correct viewJesse Duffield
2020-08-23centralise logic for rendering options mapJesse Duffield
2020-08-23minor refactorJesse Duffield
2020-08-23more standardisationJesse Duffield
2020-08-23WIPJesse Duffield
2020-08-23WIPJesse Duffield
2020-08-23standardise getting selected itemJesse Duffield
2020-08-23WIPJesse Duffield
2020-08-15more removing of gJesse Duffield
2020-08-15renameJesse Duffield
2020-08-15clean up interface for popup panelsJesse Duffield
2020-05-19allow user to scroll themselves inside merge panelv0.20.4Jesse Duffield
2020-05-19fix race condition when scrolling to merge conflictJesse Duffield
2020-05-15prevent flicker from bolding background of selected lineJesse Duffield
2020-05-13standardise how we handle background coloursv0.20.3Jesse Duffield
2020-03-29add new diff modeJesse Duffield
WIP WIP WIP WIP WIP WIP WIP
2020-03-29fix conflict race conditionJesse Duffield
2020-03-28move working tree state function into git.goJesse Duffield
2020-03-28smart refreshing filesJesse Duffield
2020-03-28more centralised handling of refreshingJesse Duffield
2020-03-25redoingJesse Duffield
2020-03-09big golangci-lint cleanupJesse Duffield
2020-01-12Missed a spot with this new string task thingJesse Duffield
The issue here was that we were using a string task but expecting to be able to set the origin straight after to point at the conflict, but because it's async it was actually resetting the origin to 0 after a little bit. The proper solution here is maybe to add a flag to that thing asking whether you want to reset main's origin. But I'm too lazy to do that right now so instead I'm just using setViewContent. That will probably cause issues in the future.
2020-01-12allow fast flicking through any list panelJesse Duffield
Up till now our approach to rendering things like file diffs, branch logs, and commit patches, has been to run a command on the command line, wait for it to complete, take its output as a string, and then write that string to the main view (or secondary view e.g. when showing both staged and unstaged changes of a file). This has caused various issues. For once, if you are flicking through a list of files and an untracked file is particularly large, not only will this require lazygit to load that whole file into memory (or more accurately it's equally large diff), it also will slow down the UI thread while loading that file, and if the user continued down the list, the original command might eventually resolve and replace whatever the diff is for the newly selected file. Following what we've done in lazydocker, I've added a tasks package for when you need something done but you want it to cancel as soon as something newer comes up. Given this typically involves running a command to display to a view, I've added a viewBufferManagerMap struct to the Gui struct which allows you to define these tasks on a per-view basis. viewBufferManagers can run files and directly write the output to their view, meaning we no longer need to use so much memory. In the tasks package there is a helper method called NewCmdTask which takes a command, an initial amount of lines to read, and then runs that command, reads that number of lines, and allows for a readLines channel to tell it to read more lines. We read more lines when we scroll or resize the window. There is an adapter for the tasks package in a file called tasks_adapter which wraps the functions from the tasks package in gui-specific stuff like clearing the main view before starting the next task that wants to write to the main view. I've removed some small features as part of this work, namely the little headers that were at the top of the main view for some situations. For example, we no longer show the upstream of a selected branch. I want to re-introduce this in the future, but I didn't want to make this tasks system too complicated, and in order to facilitate a header section in the main view we'd need to have a task that gets the upstream for the current branch, writes it to the header, then tells another task to write the branch log to the main view, but without clearing inbetween. So it would get messy. I'm thinking instead of having a separate 'header' view atop the main view to render that kind of thing (which can happen in another PR) I've also simplified the 'git show' to just call 'git show' and not do anything fancy when it comes to merge commits. I considered using this tasks approach whenever we write to a view. The only thing is that the renderString method currently resets the origin of a view and I don't want to lose that. So I've left some in there that I consider harmless, but we should probably be just using tasks now for all rendering, even if it's just strings we can instantly make.
2020-01-07cleanupDavid Chen
2020-01-07fixed keybinding display in merge_panel.goDavid Chen
2019-11-08support ours/theirs merge conflict headersJesse Duffield
2019-11-05do not return focus to commitsFiles view after selecting to start a new patchJesse Duffield
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-29 09:10:40 +0000