summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2023-06-15Turn remoteIcons into a mapStefan Haller
We don't actually use it to do map lookups; we still iterate over it in the same way as before. However, using a map makes it easier to patch elements; see the next commit.
2023-06-08Merge pull request #2717 from jesseduffield/jesseduffield-patch-1Jesse Duffield
2023-06-08Update README.mdJesse Duffield
2023-06-07Merge pull request #2712 from ↵Stefan Haller
stefanhaller/discard-changes-only-from-local-commits Allow discarding changes only from local commits
2023-06-07Allow discarding changes only from local commitsStefan Haller
We use CommitFilesController also for the files of commits that we show elsewhere, e.g. for branch commits, tags, or stashes. It doesn't make sense to discard changes from those (for stashes it might be possible to implement it somehow, but that would be a new feature), so we disallow it unless we are in the local commits panel.
2023-06-07Merge pull request #2707 from ↵Stefan Haller
stefanhaller/better-prompt-for-discarding-old-file-changes Better prompt for discarding old file changes
2023-06-07Better prompt for discarding old file changesStefan Haller
Lazygit knows what kind of file change this is, so there doesn't have to be any "if" in the prompt text.
2023-06-07Disallow discarding file changes while a directory is selectedStefan Haller
Discarding changes to an entire directory doesn't quite work correctly in all cases; for example, if the current commit added files to the directory (but the directory existed before) then those files won't be removed. It might be possible to fix the command so that these cases always work for directories, but I don't think it's worth the effort (you can always use a custom patch for that), so let's display an error for now.
2023-06-07Merge pull request #2715 from jesseduffield/recent-reposJesse Duffield
2023-06-07Fix focus issue when opening recent-repos menu at launchJesse Duffield
I don't know why we were setting the initial context to CurrentSideContext and not just CurrentContext in the first place. If there is no current context in either case it'll default to the files context. So the only issue is if we anticipated that some random context would be focused and we didn't want to activate that. But I can't think of any situation where that would happen.
2023-06-07Merge pull request #2714 from jesseduffield/author-suggestions-custom-commandsJesse Duffield
2023-06-07Support authors and tags in custom command suggestions presetJesse Duffield
2023-06-05Updated README.mdREADME-bot
2023-06-05Merge pull request #2708 from enricozb/patch-1Stefan Haller
fix kakoune binary name
2023-06-05kakoune binary nameEnrico Borba
2023-06-03Updated README.mdREADME-bot
2023-06-03Merge pull request #2704 from jesseduffield/int-matchersJesse Duffield
2023-06-03Fix flakey testJesse Duffield
Whenever we perform an action in a test, we should assert on the result before doing the next action. This prevents issues where the test moves too fast for our code. It would be nice to not have to do this, but for now that's the situation
2023-06-03Appease linterJesse Duffield
2023-06-03Support matchers on integers in integration testsJesse Duffield
2023-06-01Merge pull request #2699 from jesseduffield/revert-hide-underscoresJesse Duffield
2023-06-01Merge pull request #2700 from ↵Jesse Duffield
jesseduffield/refresh-commits-viewport-on-focus-lost
2023-06-01Add integration test for commit highlighting on focusJesse Duffield
A better refactor would be to allow matchers to assert against either a string or a slice of cells, so that I could have the same ergonomics that I have elsewhere, but this is a start.
2023-06-01Apply correct styling to root commit in graphJesse Duffield
The root commit is special in that it has no parents. So we need to add a pipe that's headed for a commit that doesn't actually exist i.e. the mythical empty tree commit. We're using the actual hash of that pseudo-commit, but it's not being read anywhere.
2023-06-01Refresh commits viewport on focus lostJesse Duffield
We don't want the highlighted selection sticking around after the context loses focus.
2023-06-01Stop hiding underscores for VSCodeJesse Duffield
VSCode had an issue in their terminal where underscores were printed all over the place. That has now been fixed. See https://github.com/jesseduffield/lazygit/issues/2294 and https://github.com/xtermjs/xterm.js/issues/4238
2023-06-01Merge pull request #2274 from jesseduffield/show-commit-against-branchJesse Duffield
2023-06-01show commits against branchesJesse Duffield
2023-06-01Merge pull request #2696 from jesseduffield/default-to-defaultJesse Duffield
2023-06-01Set defaults colours to 'default', not 'white'Jesse Duffield
'white' is great on dark themes, and terrible on light themes.
2023-06-01Merge pull request #2695 from jesseduffield/fix-time-ago-functionJesse Duffield
2023-06-01Merge pull request #2694 from stefanhaller/conflict-handling-menuStefan Haller
Show menu instead of prompt when there are conflicts in a rebase or merge
2023-06-01Show menu instead of prompt when there are conflicts in a rebase or mergeStefan Haller
This solves the issue that previously you could too easily abort a rebase accidentally by hitting escape.
2023-06-01update seconds ago function and add testsJesse Duffield
2023-06-01Merge pull request #2692 from stefanhaller/fetch-allStefan Haller
Add --all to "git fetch" command, unless disabled by config.
2023-06-01Add --all to "git fetch" command when not fetching a specific remoteStefan Haller
2023-05-31Add tests for FetchStefan Haller
2023-05-31Extract a FetchCmdObj function so that we can test itStefan Haller
No change in behavior.
2023-05-31Remove unused fetch options RemoteName and BranchNameStefan Haller
These were never used, since there are separate functions for fetching a remote and for fast-forwarding a branch.
2023-05-30Updated README.mdREADME-bot
2023-05-31Merge pull request #2688 from tzengyuxio/masterJesse Duffield
2023-05-30Add key bindings doc for ChineseTzeng Yuxio
2023-05-30Merge pull request #2690 from jesseduffield/remove-ufizziJesse Duffield
2023-05-30Merge pull request #2490 from ↵Jesse Duffield
jesseduffield/dependabot/go_modules/golang.org/x/net-0.7.0
2023-05-30Remove UffizziJesse Duffield
We've given Uffizzi a go but haven't found utility in it, so we're removing it.
2023-05-30Merge pull request #2508 from Ryooooooga/remove-jesseduffield-yamlJesse Duffield
2023-05-30Merge pull request #2686 from ↵Jesse Duffield
jesseduffield/custom-command-suggestions-from-commands
2023-05-30Add Traditional Chinese supportTzeng Yuxio
2023-05-29Support using command output directly in menuFromCommand custom command promptJesse Duffield
The menuFromCommand option is a little complicated, so I'm adding an easy way to just use the command output directly, where each line becomes a suggestion, as-is. Now that we support suggestions in the input prompt, there's less of a need for menuFromCommand, but it probably still serves some purpose. In future I want to support this filter/valueFormat/labelFormat thing for suggestions too. I would like to think a little more about the interface though: is using a regex like we currently do really the simplest approach?
2023-05-29Support suggestions generated from command in custom commandsJesse Duffield
This changes the interface a bit but it was only added earlier today so I doubt anybody is dependent on it yet. I'm also updating the docs.