mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-10 20:05:50 +02:00
[DATALAD RUNCMD] run codespell throughout fixing typos automagically
=== Do not change lines below === { "chain": [], "cmd": "codespell -w", "exit": 0, "extra_inputs": [], "inputs": [], "outputs": [], "pwd": "." } ^^^ Do not change lines above ^^^ Signed-off-by: Yaroslav Halchenko <debian@onerussian.com>
This commit is contained in:
parent
00530477c9
commit
4bbfe7b3cc
12 changed files with 12 additions and 12 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
## Packages
|
||||
|
||||
* `pkg/app`: Contains startup code, inititalises a bunch of stuff like logging, the user config, etc, before starting the gui. Catches and handles some errors that the gui raises.
|
||||
* `pkg/app`: Contains startup code, initialises a bunch of stuff like logging, the user config, etc, before starting the gui. Catches and handles some errors that the gui raises.
|
||||
* `pkg/app/daemon`: Contains code relating to the lazygit daemon. This could be better named: it's is not a daemon in the sense that it's a long-running background process; rather it's a short-lived background process that we pass to git for certain tasks, like GIT_EDITOR for when we want to set the TODO file for an interactive rebase.
|
||||
* `pkg/cheatsheet`: Generates the keybinding cheatsheets in `docs/keybindings`.
|
||||
* `pkg/commands/git_commands`: All communication to the git binary happens here. So for example there's a `Checkout` method which calls `git checkout`.
|
||||
|
|
|
@ -122,7 +122,7 @@ is this:
|
|||
"github.com/jesseduffield/lazygit/pkg/utils"
|
||||
+ "github.com/samber/lo"
|
||||
"golang.org/x/sync/errgroup"
|
||||
@@ -308,9 +309,5 @@ func (self *FixupHelper) blameAddedLines(addedLineHunks []*hunk) ([]string, erro
|
||||
@@ -308,9 +309,5 @@ func (self *FixupHelper) blameAddedLines(addedLineHunks []*hunk) ([]string, error
|
||||
func findCommit(hash string) (*models.Commit, int, bool) {
|
||||
- for i, commit := range self.c.Model().Commits {
|
||||
- if commit.Hash == hash {
|
||||
|
|
|
@ -40,7 +40,7 @@ func NewSubCommitsContext(
|
|||
|
||||
getDisplayStrings := func(startIdx int, endIdx int) [][]string {
|
||||
// This can happen if a sub-commits view is asked to be rerendered while
|
||||
// it is invisble; for example when switching screen modes, which
|
||||
// it is invisible; for example when switching screen modes, which
|
||||
// rerenders all views.
|
||||
if viewModel.GetRef() == nil {
|
||||
return [][]string{}
|
||||
|
|
|
@ -347,7 +347,7 @@ func (self *ConfirmationHelper) resizeMenu(parentPopupContext types.Context) {
|
|||
}
|
||||
|
||||
// Wraps the lines of the menu prompt to the available width and rerenders the
|
||||
// menu if neeeded. Returns the number of lines the prompt takes up.
|
||||
// menu if needed. Returns the number of lines the prompt takes up.
|
||||
func (self *ConfirmationHelper) layoutMenuPrompt(contentWidth int) int {
|
||||
oldPromptLines := self.c.Contexts().Menu.GetPromptLines()
|
||||
var promptLines []string
|
||||
|
|
|
@ -621,7 +621,7 @@ func (self *RefreshHelper) refreshStateFiles() error {
|
|||
// FilteredReflogCommits are rendered in the reflogs panel, and ReflogCommits
|
||||
// are used by the branches panel to obtain recency values for sorting.
|
||||
func (self *RefreshHelper) refreshReflogCommits() error {
|
||||
// pulling state into its own variable incase it gets swapped out for another state
|
||||
// pulling state into its own variable in case it gets swapped out for another state
|
||||
// and we get an out of bounds exception
|
||||
model := self.c.Model()
|
||||
var lastReflogCommit *models.Commit
|
||||
|
|
|
@ -20,7 +20,7 @@ const (
|
|||
// When you open a popup over it, we'll let you return to it upon pressing escape
|
||||
PERSISTENT_POPUP
|
||||
// A temporary popup is one that could be used for various things (e.g. a generic menu or confirmation popup).
|
||||
// Because we re-use these contexts, they're temporary in that you can't return to them after you've switched from them
|
||||
// Because we reuse these contexts, they're temporary in that you can't return to them after you've switched from them
|
||||
// to some other context, because the context you switched to might actually be the same context but rendering different content.
|
||||
// We should really be able to spawn new contexts for menus/prompts so that we can actually return to old ones.
|
||||
TEMPORARY_POPUP
|
||||
|
|
|
@ -1720,7 +1720,7 @@ func EnglishTranslationSet() *TranslationSet {
|
|||
MovePatchIntoNewCommit: "Move patch into new commit",
|
||||
MovePatchIntoNewCommitTooltip: "Move the patch out of its commit and into a new commit sitting on top of the original commit. This is achieved by starting an interactive rebase at the original commit, applying the patch in reverse, then applying the patch to the index and committing it as a new commit, before continuing the rebase to completion. If later commits depend on the patch, you may need to resolve conflicts.",
|
||||
MovePatchToSelectedCommit: "Move patch to selected commit (%s)",
|
||||
MovePatchToSelectedCommitTooltip: "Move the patch out of its original commit and into the selected commit. This is achieved by starting an interactive rebase at the original commit, applying the patch in reverse, then continuing the rebase up to the selected commit, before applying the patch forward and amending the seleced commit. The rebase is then continued to completion. If commits between the source and destination commit depend on the patch, you may need to resolve conflicts.",
|
||||
MovePatchToSelectedCommitTooltip: "Move the patch out of its original commit and into the selected commit. This is achieved by starting an interactive rebase at the original commit, applying the patch in reverse, then continuing the rebase up to the selected commit, before applying the patch forward and amending the selected commit. The rebase is then continued to completion. If commits between the source and destination commit depend on the patch, you may need to resolve conflicts.",
|
||||
CopyPatchToClipboard: "Copy patch to clipboard",
|
||||
NoMatchesFor: "No matches for '%s' %s",
|
||||
ExitSearchMode: "%s: Exit search mode",
|
||||
|
|
|
@ -96,7 +96,7 @@ func (self *TextMatcher) IsSelected() *TextMatcher {
|
|||
|
||||
// if the matcher has an `IsSelected` rule, it returns true, along with the matcher after that rule has been removed
|
||||
func (self *TextMatcher) checkIsSelected() (bool, *TextMatcher) {
|
||||
// copying into a new matcher in case we want to re-use the original later
|
||||
// copying into a new matcher in case we want to reuse the original later
|
||||
newMatcher := &TextMatcher{Matcher: &Matcher[string]{}}
|
||||
*newMatcher.Matcher = *self.Matcher
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ func (self *ViewDriver) VisibleLines(matchers ...*TextMatcher) *ViewDriver {
|
|||
return self.assertLines(originY, matchers...)
|
||||
}
|
||||
|
||||
// asserts that somewhere in the view there are consequetive lines matching the given matchers.
|
||||
// asserts that somewhere in the view there are consecutive lines matching the given matchers.
|
||||
func (self *ViewDriver) ContainsLines(matchers ...*TextMatcher) *ViewDriver {
|
||||
self.validateMatchersPassed(matchers)
|
||||
self.validateEnoughLines(matchers)
|
||||
|
|
|
@ -10,7 +10,7 @@ import (
|
|||
// can be relocated elsewhere if you need them somewhere else. So for example if
|
||||
// I hit enter on a branch I'll see the sub-commits view, but if I then navigate
|
||||
// to the reflog context and hit enter on a reflog, the sub-commits view is moved
|
||||
// to the reflog window. This is because we re-use the same view (it's a limitation
|
||||
// to the reflog window. This is because we reuse the same view (it's a limitation
|
||||
// that would be nice to remove in the future).
|
||||
// Nonetheless, we need to ensure that upon moving the view, the filter is cancelled.
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import (
|
|||
)
|
||||
|
||||
// Couldn't find an easy way to actually reproduce the situation of opening outside a repo,
|
||||
// so I'm introducing a hacky env var to force lazygit to show the recent repos meu upon opening.
|
||||
// so I'm introducing a hacky env var to force lazygit to show the recent repos menu upon opening.
|
||||
|
||||
var RecentReposOnLaunch = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "When opening to a menu, focus is correctly given to the menu",
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
# It's assumed that the current commit (i.e. HEAD) is broken.
|
||||
|
||||
if [[ $# -ne 3 ]] ; then
|
||||
echo 'Usage: scripts/bisect.sh <ref thats broken> <ref thats working> <integration test name>'
|
||||
echo 'Usage: scripts/bisect.sh <ref that's broken> <ref that's working> <integration test name>'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue