Age | Commit message (Collapse) | Author | |
---|---|---|---|
2020-08-23 | fix focus change on merge popup return | Jesse Duffield | |
2020-08-23 | use context to return to the correct view | Jesse Duffield | |
2020-08-23 | centralise logic for rendering options map | Jesse Duffield | |
2020-08-23 | minor refactor | Jesse Duffield | |
2020-08-23 | more standardisation | Jesse Duffield | |
2020-08-23 | WIP | Jesse Duffield | |
2020-08-23 | WIP | Jesse Duffield | |
2020-08-23 | standardise getting selected item | Jesse Duffield | |
2020-08-23 | WIP | Jesse Duffield | |
2020-08-15 | more removing of g | Jesse Duffield | |
2020-08-15 | rename | Jesse Duffield | |
2020-08-15 | clean up interface for popup panels | Jesse Duffield | |
2020-05-19 | allow user to scroll themselves inside merge panelv0.20.4 | Jesse Duffield | |
2020-05-19 | fix race condition when scrolling to merge conflict | Jesse Duffield | |
2020-05-15 | prevent flicker from bolding background of selected line | Jesse Duffield | |
2020-05-13 | standardise how we handle background coloursv0.20.3 | Jesse Duffield | |
2020-03-29 | add new diff mode | Jesse Duffield | |
WIP WIP WIP WIP WIP WIP WIP | |||
2020-03-29 | fix conflict race condition | Jesse Duffield | |
2020-03-28 | move working tree state function into git.go | Jesse Duffield | |
2020-03-28 | smart refreshing files | Jesse Duffield | |
2020-03-28 | more centralised handling of refreshing | Jesse Duffield | |
2020-03-25 | redoing | Jesse Duffield | |
2020-03-09 | big golangci-lint cleanup | Jesse Duffield | |
2020-01-12 | Missed a spot with this new string task thing | Jesse 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-12 | allow fast flicking through any list panel | Jesse 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-07 | cleanup | David Chen | |
2020-01-07 | fixed keybinding display in merge_panel.go | David Chen | |
2019-11-08 | support ours/theirs merge conflict headers | Jesse Duffield | |
2019-11-05 | do not return focus to commitsFiles view after selecting to start a new patch | Jesse Duffield | |
2019-10-20 | Added light theme option to the settings | mjarkk | |
2019-03-03 | i18n for rebase loading states | Jesse Duffield | |
2019-03-02 | mouse support | Jesse Duffield Duffield | |
2019-02-16 | fix golangci errors | Jesse Duffield | |
2019-02-16 | more work on rebasing feature | Jesse Duffield | |
2019-02-16 | introduce panel contexts and more work on rebasing | Jesse Duffield | |
2018-12-11 | Make merge panel its own panel | Jesse Duffield | |
2018-12-11 | more work on rebasing including visual indicators | Jesse Duffield | |
2018-12-11 | Making ci happier | Glenn Vriesman | |
2018-12-11 | Added check to invoke continue/refresh | Glenn Vriesman | |
2018-12-08 | fetching branches without checking out | Jesse Duffield | |
2018-08-28 | dont panic when catting directories | Jesse Duffield | |
2018-08-16 | Fixed comment on issue #137 from @jesseduffield | Mark Kopenga | |
2018-08-15 | Added translation for pkg/gui/ confirmation_panel.go gui.go merge_panel.go | Mark Kopenga | |
2018-08-14 | tried to update to latest master | Mark Kopenga | |