[pull] master from jesseduffield:master #273
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
This can easily happen for the breaking changes panel when there are many.
- **PR Description** Remember which version of lazygit the user was last running, and show a list of breaking changes since that version (if any) if the user upgraded to a newer version. It's a little unobvious how to test this manually, because we don't show the popup for developer builds. You'll have to build with something like `go build -ldflags="-X 'main.version=0.41.0'"` in order to test it. This is an extremely stripped down version of #3261.
We need this because we want to enable moving update-ref todos, which don't have a sha.
Strip the prefix at presentation time instead. This makes it easier to find update-ref todos in order to move them up/down, or delete them.
We will reuse it in the next commit.
…-sticky range So far, the only situation where we called SetSelectionRangeAndMode was one where the range could only get larger (in startInteractiveRebaseWithEdit, in which case update-ref todos can be inserted by the rebase). However, in the last commit we introduced a new call site where the range can get smaller, including being reduced to a single item. Since this is indistinguishable from a single selection, set the mode to none in this case; without this, hitting escape would seemingly do nothing because it collapses the empty range selection.
- **PR Description** Previously it wasn't possible to move an update-ref entry up or down using ctrl-j and ctrl-k, or to delete an update-ref entry. For moving, a work-around was to move the surrounding commits instead, but it's still nice to be able to do it directly. Deleting is very much necessary though, since there are situations where git adds the update-ref entries but they are not wanted; one example is if you want to make a copy of a branch and rebase to a different place, without the original branch following it. (There's a long discussion about this [here](https://public-inbox.org/git/adb7f680-5bfa-6fa5-6d8a-61323fee7f53@haller-berlin.de/).) Update-ref todos can't be set to "drop" like other todos, because they have no sha associated with them, so we need to delete them immediately. We show a confirmation before doing that, because you'd have to abort the rebase if you do it accidentally. We allow range selecting normal todos and update-ref todos at the same time; in that case, we delete all the update-ref todos and set all the other ones to "drop". Not that this is an absolutely necessary feature, but it wasn't hard to do.
Lazygit has two ways to decide whether it needs to ask the user to force-push: 1. if it knows ahead of time that the push will fail because the branch has diverged, by looking at the incoming/outgoing information that it shows as ↑3↓7. 2. by examining the error that comes back when the push has failed. The second situation should happen only rarely, because lazygit fetches every minute by default, so the ↑3↓7 information is usually up to date. It might not be if the user turned off auto-fetch (or increased the auto-fetch interval). However, in this case it's almost always harmful to prompt the user to force-push, because we know that the reason for diverging is that something was pushed to the remote, and we would wipe it out by force-pushing. In such a situation, the more likely user action is to pull the remote changes and then push normally again. So just remove the second prompt, and replace it by a better error message when we detect that updates were rejected remotely. A little bit of history archeology reveals that the second prompt was added at a time where we didn't have the first one yet, so at that time it made sense to have it; but when the first prompt was added, we should have removed the second.
Lazygit has two ways to decide whether it needs to ask the user to force-push: 1. if it knows ahead of time that the push will fail because the branch has diverged, by looking at the incoming/outgoing information that it shows as ↑3↓7. 2. by examining the error that comes back when the push has failed. The second situation should happen only rarely, because lazygit fetches every minute by default, so the ↑3↓7 information is usually up to date. It might not be if the user turned off auto-fetch (or increased the auto-fetch interval). However, in this case it's almost always harmful to prompt the user to force-push, because we know that the reason for diverging is that something was pushed to the remote, and we would wipe it out by force-pushing. In such a situation, the more likely user action is to pull the remote changes and then push normally again. So just remove the second prompt, and replace it by a better error message when we detect that updates were rejected remotely. A little bit of history archeology reveals that the second prompt was added at a time where we didn't have the first one yet, so at that time it made sense to have it; but when the first prompt was added, we should have removed the second.
The choices are to create a new local branch that tracks the remote, or a detached head.
The old behavior of showing a prompt to choose a name for the new local branch is still available via the 'n' keybinding.
This way we see the local branch immediately when switching to the branches view, and we see an inline waiting status on it when checking it out.
It sorts them already, so it's unnecessary. In the next commit we use this same code for substring searching too, and in that case we don't want to sort because sorting is by Score, but we don't even fill in the score for substring searching.
By default we now search for substrings; you can search for multiple substrings by separating them with spaces. Add a config option gui.filterMode that can be set to 'fuzzy' to switch back to the previous behavior.
It isn't necessarily fuzzy any more.
It isn't necessarily fuzzy any more.
For die-hard fuzzy-searching fans it's probably in the way, so taking it out makes fuzzy filtering work better. For substring filtering it always retains the sort order anyway.
By default we now search for substrings; you can search for multiple substrings by separating them with spaces. Add a config option `gui.filterMode` that can be set to 'fuzzy' to switch back to the previous behavior. Addresses #3373.
- **PR Description** Hi, I'm happy using `lazygit` from quite a while. I've decided to give back to community fraction of my time. I'm native polish speaker, and seen that polish translation have some gaps. I've added missing translation for polish language and improved existing one. I've followed technical jargon used on https://git-scm.com/book/pl/v2/ For easier diff comparison and feature maintenance, I've ordered keys to be in same order as those in `english.go`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )