refactor: move pkg/{git,tui} to root

Ayman Bagabas created 3 years ago

Change summary

git/commit.go                            |  0 
git/errors.go                            |  0 
git/patch.go                             |  0 
git/reference.go                         |  0 
git/repo.go                              |  0 
git/tree.go                              |  0 
internal/git/git.go                      |  2 +-
internal/tui/bubble.go                   |  2 +-
internal/tui/bubbles/repo/bubble.go      |  6 +++---
internal/tui/bubbles/selection/bubble.go |  2 +-
internal/tui/commands.go                 |  2 +-
server/middleware.go                     |  4 ++--
tui/about/bubble.go                      |  8 ++++----
tui/bubble.go                            | 12 ++++++------
tui/common/consts.go                     |  0 
tui/common/error.go                      |  0 
tui/common/formatter.go                  |  0 
tui/common/git.go                        |  2 +-
tui/common/help.go                       |  0 
tui/common/reset.go                      |  0 
tui/common/utils.go                      |  0 
tui/log/bubble.go                        |  8 ++++----
tui/refs/bubble.go                       |  4 ++--
tui/tree/bubble.go                       |  8 ++++----
tui/viewport/viewport_patch.go           |  0 
25 files changed, 30 insertions(+), 30 deletions(-)

Detailed changes

pkg/git/commit.go → git/commit.go

pkg/git/errors.go → git/errors.go

pkg/git/patch.go → git/patch.go

pkg/git/reference.go → git/reference.go

pkg/git/repo.go → git/repo.go

pkg/git/tree.go → git/tree.go

internal/git/git.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/charmbracelet/soft-serve/pkg/git"
+	"github.com/charmbracelet/soft-serve/git"
 	"github.com/gobwas/glob"
 	"github.com/golang/groupcache/lru"
 )

internal/tui/bubble.go

@@ -10,7 +10,7 @@ import (
 	"github.com/charmbracelet/soft-serve/internal/tui/bubbles/repo"
 	"github.com/charmbracelet/soft-serve/internal/tui/bubbles/selection"
 	"github.com/charmbracelet/soft-serve/internal/tui/style"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
+	"github.com/charmbracelet/soft-serve/tui/common"
 	"github.com/gliderlabs/ssh"
 )
 

internal/tui/bubbles/repo/bubble.go

@@ -6,10 +6,10 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/internal/tui/style"
-	"github.com/charmbracelet/soft-serve/pkg/git"
-	gitui "github.com/charmbracelet/soft-serve/pkg/tui"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
+	gitui "github.com/charmbracelet/soft-serve/tui"
+	"github.com/charmbracelet/soft-serve/tui/common"
 	"github.com/muesli/reflow/truncate"
 	"github.com/muesli/reflow/wrap"
 )

internal/tui/bubbles/selection/bubble.go

@@ -6,7 +6,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/internal/tui/style"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
+	"github.com/charmbracelet/soft-serve/tui/common"
 	"github.com/muesli/reflow/truncate"
 )
 

internal/tui/commands.go

@@ -7,7 +7,7 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/soft-serve/internal/tui/bubbles/repo"
 	"github.com/charmbracelet/soft-serve/internal/tui/bubbles/selection"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
+	"github.com/charmbracelet/soft-serve/tui/common"
 	gm "github.com/charmbracelet/wish/git"
 )
 

server/middleware.go

@@ -8,9 +8,9 @@ import (
 	"github.com/alecthomas/chroma/lexers"
 	gansi "github.com/charmbracelet/glamour/ansi"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/soft-serve/git"
 	appCfg "github.com/charmbracelet/soft-serve/internal/config"
-	"github.com/charmbracelet/soft-serve/pkg/git"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
+	"github.com/charmbracelet/soft-serve/tui/common"
 	"github.com/charmbracelet/wish"
 	gitwish "github.com/charmbracelet/wish/git"
 	"github.com/gliderlabs/ssh"

pkg/tui/about/bubble.go → tui/about/bubble.go

@@ -3,11 +3,11 @@ package about
 import (
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/internal/tui/style"
-	"github.com/charmbracelet/soft-serve/pkg/git"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
-	"github.com/charmbracelet/soft-serve/pkg/tui/refs"
-	vp "github.com/charmbracelet/soft-serve/pkg/tui/viewport"
+	"github.com/charmbracelet/soft-serve/tui/common"
+	"github.com/charmbracelet/soft-serve/tui/refs"
+	vp "github.com/charmbracelet/soft-serve/tui/viewport"
 	"github.com/muesli/reflow/wrap"
 )
 

pkg/tui/bubble.go → tui/bubble.go

@@ -3,13 +3,13 @@ package tui
 import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/internal/tui/style"
-	"github.com/charmbracelet/soft-serve/pkg/git"
-	"github.com/charmbracelet/soft-serve/pkg/tui/about"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
-	"github.com/charmbracelet/soft-serve/pkg/tui/log"
-	"github.com/charmbracelet/soft-serve/pkg/tui/refs"
-	"github.com/charmbracelet/soft-serve/pkg/tui/tree"
+	"github.com/charmbracelet/soft-serve/tui/about"
+	"github.com/charmbracelet/soft-serve/tui/common"
+	"github.com/charmbracelet/soft-serve/tui/log"
+	"github.com/charmbracelet/soft-serve/tui/refs"
+	"github.com/charmbracelet/soft-serve/tui/tree"
 )
 
 const (

pkg/tui/common/consts.go → tui/common/consts.go

pkg/tui/common/error.go → tui/common/error.go

pkg/tui/common/formatter.go → tui/common/formatter.go

pkg/tui/common/git.go → tui/common/git.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/charmbracelet/soft-serve/pkg/git"
+	"github.com/charmbracelet/soft-serve/git"
 )
 
 type GitRepo interface {

pkg/tui/common/help.go → tui/common/help.go

pkg/tui/common/reset.go → tui/common/reset.go

pkg/tui/common/utils.go → tui/common/utils.go

pkg/tui/log/bubble.go → tui/log/bubble.go

@@ -11,11 +11,11 @@ import (
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
 	gansi "github.com/charmbracelet/glamour/ansi"
+	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/internal/tui/style"
-	"github.com/charmbracelet/soft-serve/pkg/git"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
-	"github.com/charmbracelet/soft-serve/pkg/tui/refs"
-	vp "github.com/charmbracelet/soft-serve/pkg/tui/viewport"
+	"github.com/charmbracelet/soft-serve/tui/common"
+	"github.com/charmbracelet/soft-serve/tui/refs"
+	vp "github.com/charmbracelet/soft-serve/tui/viewport"
 )
 
 var (

pkg/tui/refs/bubble.go → tui/refs/bubble.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/internal/tui/style"
-	"github.com/charmbracelet/soft-serve/pkg/git"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
+	"github.com/charmbracelet/soft-serve/tui/common"
 )
 
 type RefMsg = *git.Reference

pkg/tui/tree/bubble.go → tui/tree/bubble.go

@@ -11,11 +11,11 @@ import (
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/soft-serve/git"
 	"github.com/charmbracelet/soft-serve/internal/tui/style"
-	"github.com/charmbracelet/soft-serve/pkg/git"
-	"github.com/charmbracelet/soft-serve/pkg/tui/common"
-	"github.com/charmbracelet/soft-serve/pkg/tui/refs"
-	vp "github.com/charmbracelet/soft-serve/pkg/tui/viewport"
+	"github.com/charmbracelet/soft-serve/tui/common"
+	"github.com/charmbracelet/soft-serve/tui/refs"
+	vp "github.com/charmbracelet/soft-serve/tui/viewport"
 	"github.com/dustin/go-humanize"
 )
 

pkg/tui/viewport/viewport_patch.go → tui/viewport/viewport_patch.go