Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gitcmds/dev.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// CreateDevBranch creates dev branch and pushes it to origin
Expand Down
2 changes: 1 addition & 1 deletion gitcmds/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// Download sources from git repo
Expand Down
2 changes: 1 addition & 1 deletion gitcmds/fork.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// Fork repo
Expand Down
2 changes: 1 addition & 1 deletion gitcmds/gitcmds.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (

goGitPkg "github.com/go-git/go-git/v5"
"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/internal/jira"
notesPkg "github.com/untillpro/qs/internal/notes"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion gitcmds/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// LinkBranchToGithubIssue links an existing remote branch to a GitHub issue and prepares notes.
Expand Down
2 changes: 1 addition & 1 deletion gitcmds/hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// SetLocalPreCommitHook - s.e.
Expand Down
2 changes: 1 addition & 1 deletion gitcmds/notes.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/voedger/voedger/pkg/goutils/logger"
)

func AddNotes(wd string, notes []string) error {
Expand Down
2 changes: 1 addition & 1 deletion gitcmds/pr.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
notesPkg "github.com/untillpro/qs/internal/notes"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

func Pr(wd string, needDraft bool) error {
Expand Down
2 changes: 1 addition & 1 deletion gitcmds/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// Status shows git repo status
Expand Down
2 changes: 1 addition & 1 deletion gitcmds/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"github.com/spf13/cobra"
"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// Upload uploads sources to git repo
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (
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.33.0
)

Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/untillpro/goutils v0.0.0-20231201170327-3c33c6010100 h1:FHcCDVOkPwZBul+sWI3cIpRpVKlwUGYyKT544XGmxkM=
github.com/untillpro/goutils v0.0.0-20231201170327-3c33c6010100/go.mod h1:D7adcEUMVzLXEjHhqZX5ss22BXJyXP3RLhJO99r8dII=
github.com/voedger/voedger v1.202405300917.1 h1:6kkNSA8hJxp1EO/lK6TM/zp9ggVhdQc/xpQt3M3SVrU=
github.com/voedger/voedger v1.202405300917.1/go.mod h1:4J0xgQCIso/XNccuxcWkqEg3r7yw3ZThKUICKP+JWyA=
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
Expand Down
2 changes: 1 addition & 1 deletion internal/cmdproc/cmdproc.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"sync"

"github.com/spf13/cobra"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/gitcmds"
"github.com/untillpro/qs/internal/commands"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

func updateCmd(_ context.Context, params *qsGlobalParams) *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/dev.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"github.com/atotto/clipboard"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/gitcmds"
"github.com/untillpro/qs/internal/issue"
"github.com/untillpro/qs/internal/jira"
"github.com/untillpro/qs/internal/notes"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

func Dev(cmd *cobra.Command, wd string, doDelete bool, ignoreHook bool, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/fork.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package commands
import (
"fmt"

"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/gitcmds"
"github.com/voedger/voedger/pkg/goutils/logger"
)

func Fork(wd string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/r.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"time"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/u.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/spf13/cobra"
"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/gitcmds"
notesPkg "github.com/untillpro/qs/internal/notes"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

func U(cmd *cobra.Command, commitMessage string, wd string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/voedger/voedger/pkg/goutils/logger"
"golang.org/x/mod/semver"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/issue/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"strings"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/internal/jira"
"github.com/untillpro/qs/internal/notes"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

type IssueType int
Expand Down
2 changes: 1 addition & 1 deletion internal/notes/notes.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"strings"

"github.com/untillpro/goutils/logger"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// current version of the Notes struct
Expand Down
2 changes: 1 addition & 1 deletion internal/systrun/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/google/uuid"
goUtilsExec "github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/gitcmds"
"github.com/untillpro/qs/internal/commands"
"github.com/untillpro/qs/internal/jira"
"github.com/untillpro/qs/utils"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// checkPrerequisites ensures all required tools are available
Expand Down
2 changes: 1 addition & 1 deletion qs.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"os"

"github.com/untillpro/goutils/logger"
"github.com/untillpro/qs/internal/cmdproc"
"github.com/voedger/voedger/pkg/goutils/logger"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR switches to github.com/voedger/voedger/pkg/goutils/logger, but .augment/rules/ar-coding-standards.md still mandates github.com/untillpro/goutils/logger. Consider updating that rule to avoid conflicting guidance for future changes/reviews.

Severity: low

Fix This in Augment

🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage.

)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion utils/retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strconv"
"time"

"github.com/untillpro/goutils/logger"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// RetryConfig holds configuration for retry operations
Expand Down
2 changes: 1 addition & 1 deletion utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"time"

"github.com/untillpro/goutils/exec"
"github.com/untillpro/goutils/logger"
"github.com/voedger/voedger/pkg/goutils/logger"
)

// GetUserEmail - github user email
Expand Down
Loading