Skip to content

Commit 4bbfe7b

Browse files
yarikopticstefanhaller
authored andcommitted
[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 <[email protected]>
1 parent 0053047 commit 4bbfe7b

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

docs/dev/Codebase_Guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Packages
44

5-
* `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.
5+
* `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.
66
* `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.
77
* `pkg/cheatsheet`: Generates the keybinding cheatsheets in `docs/keybindings`.
88
* `pkg/commands/git_commands`: All communication to the git binary happens here. So for example there's a `Checkout` method which calls `git checkout`.

docs/dev/Find_Base_Commit_For_Fixup_Design.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ is this:
122122
"github.com/jesseduffield/lazygit/pkg/utils"
123123
+ "github.com/samber/lo"
124124
"golang.org/x/sync/errgroup"
125-
@@ -308,9 +309,5 @@ func (self *FixupHelper) blameAddedLines(addedLineHunks []*hunk) ([]string, erro
125+
@@ -308,9 +309,5 @@ func (self *FixupHelper) blameAddedLines(addedLineHunks []*hunk) ([]string, error
126126
func findCommit(hash string) (*models.Commit, int, bool) {
127127
- for i, commit := range self.c.Model().Commits {
128128
- if commit.Hash == hash {

pkg/gui/context/sub_commits_context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func NewSubCommitsContext(
4040

4141
getDisplayStrings := func(startIdx int, endIdx int) [][]string {
4242
// This can happen if a sub-commits view is asked to be rerendered while
43-
// it is invisble; for example when switching screen modes, which
43+
// it is invisible; for example when switching screen modes, which
4444
// rerenders all views.
4545
if viewModel.GetRef() == nil {
4646
return [][]string{}

pkg/gui/controllers/helpers/confirmation_helper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ func (self *ConfirmationHelper) resizeMenu(parentPopupContext types.Context) {
347347
}
348348

349349
// Wraps the lines of the menu prompt to the available width and rerenders the
350-
// menu if neeeded. Returns the number of lines the prompt takes up.
350+
// menu if needed. Returns the number of lines the prompt takes up.
351351
func (self *ConfirmationHelper) layoutMenuPrompt(contentWidth int) int {
352352
oldPromptLines := self.c.Contexts().Menu.GetPromptLines()
353353
var promptLines []string

pkg/gui/controllers/helpers/refresh_helper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ func (self *RefreshHelper) refreshStateFiles() error {
621621
// FilteredReflogCommits are rendered in the reflogs panel, and ReflogCommits
622622
// are used by the branches panel to obtain recency values for sorting.
623623
func (self *RefreshHelper) refreshReflogCommits() error {
624-
// pulling state into its own variable incase it gets swapped out for another state
624+
// pulling state into its own variable in case it gets swapped out for another state
625625
// and we get an out of bounds exception
626626
model := self.c.Model()
627627
var lastReflogCommit *models.Commit

pkg/gui/types/context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const (
2020
// When you open a popup over it, we'll let you return to it upon pressing escape
2121
PERSISTENT_POPUP
2222
// A temporary popup is one that could be used for various things (e.g. a generic menu or confirmation popup).
23-
// Because we re-use these contexts, they're temporary in that you can't return to them after you've switched from them
23+
// Because we reuse these contexts, they're temporary in that you can't return to them after you've switched from them
2424
// to some other context, because the context you switched to might actually be the same context but rendering different content.
2525
// We should really be able to spawn new contexts for menus/prompts so that we can actually return to old ones.
2626
TEMPORARY_POPUP

pkg/i18n/english.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,7 @@ func EnglishTranslationSet() *TranslationSet {
17201720
MovePatchIntoNewCommit: "Move patch into new commit",
17211721
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.",
17221722
MovePatchToSelectedCommit: "Move patch to selected commit (%s)",
1723-
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.",
1723+
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.",
17241724
CopyPatchToClipboard: "Copy patch to clipboard",
17251725
NoMatchesFor: "No matches for '%s' %s",
17261726
ExitSearchMode: "%s: Exit search mode",

pkg/integration/components/text_matcher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func (self *TextMatcher) IsSelected() *TextMatcher {
9696

9797
// if the matcher has an `IsSelected` rule, it returns true, along with the matcher after that rule has been removed
9898
func (self *TextMatcher) checkIsSelected() (bool, *TextMatcher) {
99-
// copying into a new matcher in case we want to re-use the original later
99+
// copying into a new matcher in case we want to reuse the original later
100100
newMatcher := &TextMatcher{Matcher: &Matcher[string]{}}
101101
*newMatcher.Matcher = *self.Matcher
102102

pkg/integration/components/view_driver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (self *ViewDriver) VisibleLines(matchers ...*TextMatcher) *ViewDriver {
7575
return self.assertLines(originY, matchers...)
7676
}
7777

78-
// asserts that somewhere in the view there are consequetive lines matching the given matchers.
78+
// asserts that somewhere in the view there are consecutive lines matching the given matchers.
7979
func (self *ViewDriver) ContainsLines(matchers ...*TextMatcher) *ViewDriver {
8080
self.validateMatchersPassed(matchers)
8181
self.validateEnoughLines(matchers)

pkg/integration/tests/filter_and_search/nested_filter_transient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
// can be relocated elsewhere if you need them somewhere else. So for example if
1111
// I hit enter on a branch I'll see the sub-commits view, but if I then navigate
1212
// to the reflog context and hit enter on a reflog, the sub-commits view is moved
13-
// to the reflog window. This is because we re-use the same view (it's a limitation
13+
// to the reflog window. This is because we reuse the same view (it's a limitation
1414
// that would be nice to remove in the future).
1515
// Nonetheless, we need to ensure that upon moving the view, the filter is cancelled.
1616

pkg/integration/tests/misc/recent_repos_on_launch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
)
77

88
// Couldn't find an easy way to actually reproduce the situation of opening outside a repo,
9-
// so I'm introducing a hacky env var to force lazygit to show the recent repos meu upon opening.
9+
// so I'm introducing a hacky env var to force lazygit to show the recent repos menu upon opening.
1010

1111
var RecentReposOnLaunch = NewIntegrationTest(NewIntegrationTestArgs{
1212
Description: "When opening to a menu, focus is correctly given to the menu",

scripts/bisect.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# It's assumed that the current commit (i.e. HEAD) is broken.
1212

1313
if [[ $# -ne 3 ]] ; then
14-
echo 'Usage: scripts/bisect.sh <ref thats broken> <ref thats working> <integration test name>'
14+
echo 'Usage: scripts/bisect.sh <ref that's broken> <ref that's working> <integration test name>'
1515
exit 1
1616
fi
1717

0 commit comments

Comments
 (0)