test issue 2 #149
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright (c) 2026-present unTill Software Development Group B.V. | ||
| * @author Denis Gribanov | ||
| */ | ||
|
|
||
| package gitcmds | ||
|
|
||
| import "strings" | ||
|
|
||
| // LoadRepoContext gathers repository state needed by Dev() in minimal git round-trips. | ||
| // Phase 1 runs five independent local git commands concurrently. | ||
| // Phase 2 issues one gh API call that requires Org/Repo obtained in phase 1. | ||
| func LoadRepoContext(wd string) (*RepoContext, error) { | ||
| rc := &RepoContext{} | ||
|
|
||
| type result struct { | ||
| setFn func() | ||
| err error | ||
| } | ||
|
|
||
| const numConcurrent = 5 | ||
| ch := make(chan result, numConcurrent) | ||
|
|
||
| go func() { | ||
| v, err := HasRemote(wd, "upstream") | ||
| ch <- result{setFn: func() { rc.UpstreamExists = v }, err: err} | ||
| }() | ||
|
|
||
| go func() { | ||
| repo, org, err := GetRepoAndOrgName(wd) | ||
| ch <- result{setFn: func() { rc.Repo = repo; rc.Org = org }, err: err} | ||
| }() | ||
|
|
||
| go func() { | ||
| v, err := GetCurrentBranchName(wd) | ||
| ch <- result{setFn: func() { rc.CurrentBranch = v }, err: err} | ||
| }() | ||
|
|
||
| go func() { | ||
| v, err := GetMainBranch(wd) | ||
| ch <- result{setFn: func() { rc.MainBranch = v }, err: err} | ||
| }() | ||
|
|
||
| go func() { | ||
| v, err := HaveUncommittedChanges(wd) | ||
| ch <- result{setFn: func() { rc.HasUncommittedChanges = v }, err: err} | ||
| }() | ||
|
|
||
| for range numConcurrent { | ||
| r := <-ch | ||
| if r.err != nil { | ||
| return nil, r.err | ||
| } | ||
| r.setFn() | ||
| } | ||
|
|
||
| rc.IsMain = strings.EqualFold(rc.CurrentBranch, rc.MainBranch) | ||
|
|
||
| // Phase 2: gh API call needs Org/Repo from phase 1 | ||
| parentRepo, err := getParentRepoByOrgRepo(wd, rc.Org, rc.Repo) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| rc.ParentRepo = parentRepo | ||
|
|
||
| return rc, nil | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,46 @@ | ||
| module github.com/untillpro/qs | ||
|
|
||
| go 1.26.2 | ||
|
|
||
| require ( | ||
| github.com/atotto/clipboard v0.1.4 | ||
| github.com/coreos/go-semver v0.3.1 | ||
| github.com/fatih/color v1.19.0 | ||
| github.com/go-git/go-git/v5 v5.18.0 | ||
| github.com/google/uuid v1.6.0 | ||
| github.com/spf13/cobra v1.10.2 | ||
| github.com/stretchr/testify v1.11.1 | ||
| github.com/untillpro/goutils v0.0.0-20231201170327-3c33c6010100 | ||
| github.com/voedger/voedger v1.202405300917.1 | ||
| golang.org/x/mod v0.35.0 | ||
| ) | ||
|
|
||
| require ( | ||
| dario.cat/mergo v1.0.2 // indirect | ||
| github.com/Microsoft/go-winio v0.6.2 // indirect | ||
| github.com/ProtonMail/go-crypto v1.4.1 // indirect | ||
| github.com/cloudflare/circl v1.6.3 // indirect | ||
| github.com/cyphar/filepath-securejoin v0.6.1 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/emirpasic/gods v1.18.1 // indirect | ||
| github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect | ||
| github.com/go-git/go-billy/v5 v5.8.0 // indirect | ||
| github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect | ||
| github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
| github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect | ||
| github.com/kevinburke/ssh_config v1.6.0 // indirect | ||
| github.com/klauspost/cpuid/v2 v2.3.0 // indirect | ||
| github.com/mattn/go-colorable v0.1.14 // indirect | ||
| github.com/mattn/go-isatty v0.0.21 // indirect | ||
| github.com/pjbgf/sha1cd v0.5.0 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| github.com/sergi/go-diff v1.4.0 // indirect | ||
| github.com/skeema/knownhosts v1.3.2 // indirect | ||
| github.com/spf13/pflag v1.0.10 // indirect | ||
| github.com/xanzy/ssh-agent v0.3.3 // indirect | ||
| golang.org/x/crypto v0.50.0 // indirect | ||
| golang.org/x/net v0.53.0 // indirect | ||
| golang.org/x/sys v0.43.0 // indirect | ||
| gopkg.in/warnings.v0 v0.1.2 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) |
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor: first-error-wins loses information.
When the first received
r.erris non-nil, the function returns immediately. The other four goroutines keep running, write to the buffered channel, and their results — including any further errors — are discarded silently. For a five-way fan-out this is probably fine in practice (and the channel is buffered tonumConcurrentso there is no goroutine leak), but consider either:errors.Join, so a real failure surfaces alongside any secondary failures, orfmt.Errorf("HasRemote(upstream): %w", err)inside each goroutine) so the caller can tell which sub-call actually failed.As written, a user only ever sees one bare error message with no indication of which of the five git calls produced it.