Diff
1diff --git a/pkg/git/commit.go b/git/commit.go
2rename from pkg/git/commit.go
3rename to git/commit.go
4diff --git a/pkg/git/errors.go b/git/errors.go
5rename from pkg/git/errors.go
6rename to git/errors.go
7diff --git a/pkg/git/patch.go b/git/patch.go
8rename from pkg/git/patch.go
9rename to git/patch.go
10diff --git a/pkg/git/reference.go b/git/reference.go
11rename from pkg/git/reference.go
12rename to git/reference.go
13diff --git a/pkg/git/repo.go b/git/repo.go
14rename from pkg/git/repo.go
15rename to git/repo.go
16diff --git a/pkg/git/tree.go b/git/tree.go
17rename from pkg/git/tree.go
18rename to git/tree.go
19diff --git a/internal/git/git.go b/internal/git/git.go
20index 87c84ac9f91d39ec939ae62c248a2e7ac2b79bc1..05e2ab70fdcebb694767944653f64642d0787c43 100644
21--- a/internal/git/git.go
22+++ b/internal/git/git.go
23@@ -7,7 +7,7 @@ import (
24 "path/filepath"
25 "sync"
26
27- "github.com/charmbracelet/soft-serve/pkg/git"
28+ "github.com/charmbracelet/soft-serve/git"
29 "github.com/gobwas/glob"
30 "github.com/golang/groupcache/lru"
31 )
32diff --git a/internal/tui/bubble.go b/internal/tui/bubble.go
33index bacc3de883538dd8cace59bbd1cce185b0b783bf..436dbc4db92ec62b0a84c49478aa9da1260dd5e4 100644
34--- a/internal/tui/bubble.go
35+++ b/internal/tui/bubble.go
36@@ -10,7 +10,7 @@ import (
37 "github.com/charmbracelet/soft-serve/internal/tui/bubbles/repo"
38 "github.com/charmbracelet/soft-serve/internal/tui/bubbles/selection"
39 "github.com/charmbracelet/soft-serve/internal/tui/style"
40- "github.com/charmbracelet/soft-serve/pkg/tui/common"
41+ "github.com/charmbracelet/soft-serve/tui/common"
42 "github.com/gliderlabs/ssh"
43 )
44
45diff --git a/internal/tui/bubbles/repo/bubble.go b/internal/tui/bubbles/repo/bubble.go
46index b8cdd0e2d7e689c671fa4d1f8576faf65cb8d14f..6e9a34a99a99db365955758f5ae776f1dbfbdd22 100644
47--- a/internal/tui/bubbles/repo/bubble.go
48+++ b/internal/tui/bubbles/repo/bubble.go
49@@ -6,10 +6,10 @@ import (
50
51 tea "github.com/charmbracelet/bubbletea"
52 "github.com/charmbracelet/lipgloss"
53+ "github.com/charmbracelet/soft-serve/git"
54 "github.com/charmbracelet/soft-serve/internal/tui/style"
55- "github.com/charmbracelet/soft-serve/pkg/git"
56- gitui "github.com/charmbracelet/soft-serve/pkg/tui"
57- "github.com/charmbracelet/soft-serve/pkg/tui/common"
58+ gitui "github.com/charmbracelet/soft-serve/tui"
59+ "github.com/charmbracelet/soft-serve/tui/common"
60 "github.com/muesli/reflow/truncate"
61 "github.com/muesli/reflow/wrap"
62 )
63diff --git a/internal/tui/bubbles/selection/bubble.go b/internal/tui/bubbles/selection/bubble.go
64index 866de2db81e189426cfad9bc9f1f89f02140c89c..8be37dcf3b2a1e78974bc22c7c1caa830f5a8390 100644
65--- a/internal/tui/bubbles/selection/bubble.go
66+++ b/internal/tui/bubbles/selection/bubble.go
67@@ -6,7 +6,7 @@ import (
68 tea "github.com/charmbracelet/bubbletea"
69 "github.com/charmbracelet/lipgloss"
70 "github.com/charmbracelet/soft-serve/internal/tui/style"
71- "github.com/charmbracelet/soft-serve/pkg/tui/common"
72+ "github.com/charmbracelet/soft-serve/tui/common"
73 "github.com/muesli/reflow/truncate"
74 )
75
76diff --git a/internal/tui/commands.go b/internal/tui/commands.go
77index e95bfc3dcbd6eba275a4e26c91e11fdef1779b3c..64c1ff4851dc3ec81f41babc2a758be065b600d3 100644
78--- a/internal/tui/commands.go
79+++ b/internal/tui/commands.go
80@@ -7,7 +7,7 @@ import (
81 "github.com/charmbracelet/lipgloss"
82 "github.com/charmbracelet/soft-serve/internal/tui/bubbles/repo"
83 "github.com/charmbracelet/soft-serve/internal/tui/bubbles/selection"
84- "github.com/charmbracelet/soft-serve/pkg/tui/common"
85+ "github.com/charmbracelet/soft-serve/tui/common"
86 gm "github.com/charmbracelet/wish/git"
87 )
88
89diff --git a/server/middleware.go b/server/middleware.go
90index 9f3f230090ba2fe5f1d4dea30e7de08def307e52..cfe89a3fd9a444ee19de17eb504fe4bfdf23de47 100644
91--- a/server/middleware.go
92+++ b/server/middleware.go
93@@ -8,9 +8,9 @@ import (
94 "github.com/alecthomas/chroma/lexers"
95 gansi "github.com/charmbracelet/glamour/ansi"
96 "github.com/charmbracelet/lipgloss"
97+ "github.com/charmbracelet/soft-serve/git"
98 appCfg "github.com/charmbracelet/soft-serve/internal/config"
99- "github.com/charmbracelet/soft-serve/pkg/git"
100- "github.com/charmbracelet/soft-serve/pkg/tui/common"
101+ "github.com/charmbracelet/soft-serve/tui/common"
102 "github.com/charmbracelet/wish"
103 gitwish "github.com/charmbracelet/wish/git"
104 "github.com/gliderlabs/ssh"
105diff --git a/pkg/tui/about/bubble.go b/tui/about/bubble.go
106rename from pkg/tui/about/bubble.go
107rename to tui/about/bubble.go
108index bc819af6ab6d267e9f4e6afde4f23f12e25d7018..9205268e97a49a16846cd81c4cea4d1fd28800e9 100644
109--- a/pkg/tui/about/bubble.go
110+++ b/tui/about/bubble.go
111@@ -3,11 +3,11 @@ package about
112 import (
113 "github.com/charmbracelet/bubbles/viewport"
114 tea "github.com/charmbracelet/bubbletea"
115+ "github.com/charmbracelet/soft-serve/git"
116 "github.com/charmbracelet/soft-serve/internal/tui/style"
117- "github.com/charmbracelet/soft-serve/pkg/git"
118- "github.com/charmbracelet/soft-serve/pkg/tui/common"
119- "github.com/charmbracelet/soft-serve/pkg/tui/refs"
120- vp "github.com/charmbracelet/soft-serve/pkg/tui/viewport"
121+ "github.com/charmbracelet/soft-serve/tui/common"
122+ "github.com/charmbracelet/soft-serve/tui/refs"
123+ vp "github.com/charmbracelet/soft-serve/tui/viewport"
124 "github.com/muesli/reflow/wrap"
125 )
126
127diff --git a/pkg/tui/bubble.go b/tui/bubble.go
128rename from pkg/tui/bubble.go
129rename to tui/bubble.go
130index 40a3ace61c52730d7fa208dbf2dbcd5c47420a49..e23442472c4260ccae1a77523e1e8071212380d9 100644
131--- a/pkg/tui/bubble.go
132+++ b/tui/bubble.go
133@@ -3,13 +3,13 @@ package tui
134 import (
135 tea "github.com/charmbracelet/bubbletea"
136 "github.com/charmbracelet/lipgloss"
137+ "github.com/charmbracelet/soft-serve/git"
138 "github.com/charmbracelet/soft-serve/internal/tui/style"
139- "github.com/charmbracelet/soft-serve/pkg/git"
140- "github.com/charmbracelet/soft-serve/pkg/tui/about"
141- "github.com/charmbracelet/soft-serve/pkg/tui/common"
142- "github.com/charmbracelet/soft-serve/pkg/tui/log"
143- "github.com/charmbracelet/soft-serve/pkg/tui/refs"
144- "github.com/charmbracelet/soft-serve/pkg/tui/tree"
145+ "github.com/charmbracelet/soft-serve/tui/about"
146+ "github.com/charmbracelet/soft-serve/tui/common"
147+ "github.com/charmbracelet/soft-serve/tui/log"
148+ "github.com/charmbracelet/soft-serve/tui/refs"
149+ "github.com/charmbracelet/soft-serve/tui/tree"
150 )
151
152 const (
153diff --git a/pkg/tui/common/consts.go b/tui/common/consts.go
154rename from pkg/tui/common/consts.go
155rename to tui/common/consts.go
156diff --git a/pkg/tui/common/error.go b/tui/common/error.go
157rename from pkg/tui/common/error.go
158rename to tui/common/error.go
159diff --git a/pkg/tui/common/formatter.go b/tui/common/formatter.go
160rename from pkg/tui/common/formatter.go
161rename to tui/common/formatter.go
162diff --git a/pkg/tui/common/git.go b/tui/common/git.go
163rename from pkg/tui/common/git.go
164rename to tui/common/git.go
165index 64a371de644feef6adb5d41c00dda4ed59c28e2f..43cb53ca46a632ef64b7685a5186ef9070449f0f 100644
166--- a/pkg/tui/common/git.go
167+++ b/tui/common/git.go
168@@ -1,7 +1,7 @@
169 package common
170
171 import (
172- "github.com/charmbracelet/soft-serve/pkg/git"
173+ "github.com/charmbracelet/soft-serve/git"
174 )
175
176 type GitRepo interface {
177diff --git a/pkg/tui/common/help.go b/tui/common/help.go
178rename from pkg/tui/common/help.go
179rename to tui/common/help.go
180diff --git a/pkg/tui/common/reset.go b/tui/common/reset.go
181rename from pkg/tui/common/reset.go
182rename to tui/common/reset.go
183diff --git a/pkg/tui/common/utils.go b/tui/common/utils.go
184rename from pkg/tui/common/utils.go
185rename to tui/common/utils.go
186diff --git a/pkg/tui/log/bubble.go b/tui/log/bubble.go
187rename from pkg/tui/log/bubble.go
188rename to tui/log/bubble.go
189index e58b6d5ba15d286e33cb62a296565380da1a6919..328e338e77eed1975e0510eee997faa3c58f998e 100644
190--- a/pkg/tui/log/bubble.go
191+++ b/tui/log/bubble.go
192@@ -11,11 +11,11 @@ import (
193 "github.com/charmbracelet/bubbles/viewport"
194 tea "github.com/charmbracelet/bubbletea"
195 gansi "github.com/charmbracelet/glamour/ansi"
196+ "github.com/charmbracelet/soft-serve/git"
197 "github.com/charmbracelet/soft-serve/internal/tui/style"
198- "github.com/charmbracelet/soft-serve/pkg/git"
199- "github.com/charmbracelet/soft-serve/pkg/tui/common"
200- "github.com/charmbracelet/soft-serve/pkg/tui/refs"
201- vp "github.com/charmbracelet/soft-serve/pkg/tui/viewport"
202+ "github.com/charmbracelet/soft-serve/tui/common"
203+ "github.com/charmbracelet/soft-serve/tui/refs"
204+ vp "github.com/charmbracelet/soft-serve/tui/viewport"
205 )
206
207 var (
208diff --git a/pkg/tui/refs/bubble.go b/tui/refs/bubble.go
209rename from pkg/tui/refs/bubble.go
210rename to tui/refs/bubble.go
211index f31f12aaceb6c2855c93b886788f169411d96588..7a794c2b6af8fbe1c89f726541459edac60fda2d 100644
212--- a/pkg/tui/refs/bubble.go
213+++ b/tui/refs/bubble.go
214@@ -7,9 +7,9 @@ import (
215
216 "github.com/charmbracelet/bubbles/list"
217 tea "github.com/charmbracelet/bubbletea"
218+ "github.com/charmbracelet/soft-serve/git"
219 "github.com/charmbracelet/soft-serve/internal/tui/style"
220- "github.com/charmbracelet/soft-serve/pkg/git"
221- "github.com/charmbracelet/soft-serve/pkg/tui/common"
222+ "github.com/charmbracelet/soft-serve/tui/common"
223 )
224
225 type RefMsg = *git.Reference
226diff --git a/pkg/tui/tree/bubble.go b/tui/tree/bubble.go
227rename from pkg/tui/tree/bubble.go
228rename to tui/tree/bubble.go
229index d2b276d55131a778b3882745d4ae6aa4210845c7..74a5ccb3c8b84181179ba2322cf2281d649233e4 100644
230--- a/pkg/tui/tree/bubble.go
231+++ b/tui/tree/bubble.go
232@@ -11,11 +11,11 @@ import (
233 "github.com/charmbracelet/bubbles/viewport"
234 tea "github.com/charmbracelet/bubbletea"
235 "github.com/charmbracelet/lipgloss"
236+ "github.com/charmbracelet/soft-serve/git"
237 "github.com/charmbracelet/soft-serve/internal/tui/style"
238- "github.com/charmbracelet/soft-serve/pkg/git"
239- "github.com/charmbracelet/soft-serve/pkg/tui/common"
240- "github.com/charmbracelet/soft-serve/pkg/tui/refs"
241- vp "github.com/charmbracelet/soft-serve/pkg/tui/viewport"
242+ "github.com/charmbracelet/soft-serve/tui/common"
243+ "github.com/charmbracelet/soft-serve/tui/refs"
244+ vp "github.com/charmbracelet/soft-serve/tui/viewport"
245 "github.com/dustin/go-humanize"
246 )
247
248diff --git a/pkg/tui/viewport/viewport_patch.go b/tui/viewport/viewport_patch.go
249rename from pkg/tui/viewport/viewport_patch.go
250rename to tui/viewport/viewport_patch.go