Skip to content
Navigation Menu
{{ message }}
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathcommit.go
More file actions
342 lines (286 loc) · 9.8 KB
/
Copy pathcommit.go
File metadata and controls
342 lines (286 loc) · 9.8 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
package commit
import (
"context"
"errors"
"fmt"
"log/slog"
"strings"
"github.com/hasansino/commit/pkg/commit/modules"
"github.com/hasansino/commit/pkg/commit/ui"
)
const defaultRepoPath = "."
type Service struct {
logger *slog.Logger
settings *Settings
gitOps gitOperationsAccessor
aiService aiServiceAccessor
modules []moduleAccessor
}
func NewCommitService(settings *Settings, opts ...Option) (*Service, error) {
if err := settings.Validate(); err != nil {
return nil, fmt.Errorf("invalid options: %w", err)
}
svc := &Service{
settings: settings,
modules: make([]moduleAccessor, 0),
}
for _, opt := range opts {
opt(svc)
}
if svc.logger == nil {
svc.logger = slog.New(slog.DiscardHandler)
}
git, err := newGitOperations(defaultRepoPath)
if err != nil {
return nil, fmt.Errorf("failed to initialize git operations: %w", err)
}
svc.gitOps = git
svc.aiService = newAIService(svc.logger, settings.Timeout)
// Parse Jira task position
var jiraPosition modules.JiraTaskPosition
switch strings.ToLower(settings.JiraTaskPosition) {
case string(modules.JiraTaskPositionPrefix):
jiraPosition = modules.JiraTaskPositionPrefix
case string(modules.JiraTaskPositionInfix):
jiraPosition = modules.JiraTaskPositionInfix
case string(modules.JiraTaskPositionSuffix):
jiraPosition = modules.JiraTaskPositionSuffix
default:
jiraPosition = modules.JiraTaskPositionNone
}
// Parse Jira task style
var jiraStyle modules.JiraTaskStyle
switch strings.ToLower(settings.JiraTaskStyle) {
case string(modules.JiraTaskStyleBrackets):
jiraStyle = modules.JiraTaskStyleBrackets
case string(modules.JiraTaskStyleParens):
jiraStyle = modules.JiraTaskStyleParens
case string(modules.JiraTaskStylePlainColon):
jiraStyle = modules.JiraTaskStylePlainColon
default:
jiraStyle = modules.JiraTaskStylePlain
}
svc.modules = append(svc.modules, modules.NewJIRATaskDetector(jiraPosition, jiraStyle))
return svc, nil
}
func (s *Service) Execute(ctx context.Context) error {
if s.aiService.NumProviders() == 0 {
s.logger.WarnContext(ctx, "No providers configured")
return fmt.Errorf("no api keys found in environment")
}
if !s.gitOps.IsGitRepository() {
return fmt.Errorf("not a git repository")
}
repoStateStr, err := s.gitOps.GetRepoState()
if err != nil {
s.logger.ErrorContext(ctx, "Failed to get repository state", "error", err)
return fmt.Errorf("failed to get repository state: %w", err)
}
if repoStateStr != RepoStateNormal {
s.logger.ErrorContext(ctx, "Repository not in normal state", "state", repoStateStr)
return fmt.Errorf("repository is in %s state, cannot create commit", repoStateStr)
}
hasConflicts, _, err := s.gitOps.HasConflicts()
if err != nil {
s.logger.ErrorContext(ctx, "Failed to check for conflicts", "error", err)
return fmt.Errorf("failed to check for conflicts: %w", err)
}
if hasConflicts {
s.logger.ErrorContext(ctx, "Unresolved conflicts detected")
return fmt.Errorf("unresolved conflicts detected")
}
s.logger.DebugContext(ctx, "Unstaging all files...")
if err := s.gitOps.UnstageAll(); err != nil {
s.logger.ErrorContext(ctx, "Failed to unstage files", "error", err)
return fmt.Errorf("failed to unstage files: %w", err)
}
s.logger.DebugContext(ctx, "Staging files...")
stagedFiles, err := s.gitOps.StageFiles(
s.settings.ExcludePatterns,
s.settings.IncludePatterns,
s.settings.UseGlobalGitignore,
)
if err != nil {
s.logger.ErrorContext(ctx, "Failed to stage files", "error", err)
return fmt.Errorf("failed to stage files: %w", err)
}
if len(stagedFiles) == 0 {
s.logger.WarnContext(ctx, "No files to commit")
return nil
}
s.logger.DebugContext(ctx, "Getting staged diff...")
diff, err := s.gitOps.GetStagedDiff(s.settings.MaxDiffSizeBytes)
if err != nil {
s.logger.ErrorContext(ctx, "Failed to get staged diff", "error", err)
return fmt.Errorf("failed to get diff: %w", err)
}
if strings.TrimSpace(diff) == "" {
s.logger.WarnContext(ctx, "No changes staged for commit")
return nil
}
branch, err := s.gitOps.GetCurrentBranch()
if err != nil {
s.logger.ErrorContext(ctx, "Failed to get current branch", "error", err)
return fmt.Errorf("failed to get current branch: %w", err)
}
s.logger.DebugContext(ctx, "Requesting commit messages...")
messages, err := s.aiService.GenerateCommitMessages(
ctx,
diff, branch, stagedFiles,
s.settings.Providers, s.settings.CustomPrompt,
s.settings.First, s.settings.MultiLine,
)
if err != nil {
s.logger.ErrorContext(ctx, "Failed to generate commit messages", "error", err)
return fmt.Errorf("failed to generate suggestions: %w", err)
}
return s.processCommitMessages(ctx, messages, branch)
}
// processCommitMessages handles the commit message selection and commit creation
func (s *Service) processCommitMessages(ctx context.Context, messages map[string]string, branch string) error {
var commitMessage string
if s.settings.Auto {
commitMessage = s.getRandomMessage(messages)
if commitMessage == "" {
s.logger.WarnContext(ctx, "No valid suggestions available for auto-commit")
return fmt.Errorf("no valid suggestions available for auto-commit")
}
s.logger.DebugContext(ctx, "Auto-selected commit message", "message", commitMessage)
} else {
s.logger.DebugContext(ctx, "Using interactive mode...")
uiModel, err := ui.RenderInteractiveUI(
ctx,
messages,
map[string]bool{
ui.CheckboxIDDryRun: s.settings.DryRun,
ui.CheckboxIDPush: !s.settings.DryRun && s.settings.Push,
ui.CheckboxIDCreateTagMajor: !s.settings.DryRun && s.settings.Tag == "major",
ui.CheckboxIDCreateTagMinor: !s.settings.DryRun && s.settings.Tag == "minor",
ui.CheckboxIDCreateTagPatch: !s.settings.DryRun && s.settings.Tag == "patch",
},
)
if err != nil {
if errors.Is(err, context.Canceled) {
s.logger.WarnContext(ctx, "Interactive mode canceled by user")
return nil
}
s.logger.ErrorContext(ctx, "Failed to enter interactive mode", "error", err)
return fmt.Errorf("failed to run interactive ui: %w", err)
}
commitMessage = uiModel.GetFinalChoice()
// override flags if user interacted with checkboxes
s.settings.DryRun = uiModel.GetCheckboxValue(ui.CheckboxIDDryRun)
s.settings.Push = uiModel.GetCheckboxValue(ui.CheckboxIDPush)
s.settings.Tag = ""
if uiModel.GetCheckboxValue(ui.CheckboxIDCreateTagMajor) {
s.settings.Tag = "major"
}
if uiModel.GetCheckboxValue(ui.CheckboxIDCreateTagMinor) {
s.settings.Tag = "minor"
}
if uiModel.GetCheckboxValue(ui.CheckboxIDCreateTagPatch) {
s.settings.Tag = "patch"
}
}
if len(commitMessage) == 0 {
s.logger.WarnContext(ctx, "No commit message provided")
return fmt.Errorf("no commit message provided")
}
for _, module := range s.modules {
var (
updatedMessage string
workDone bool
err error
)
s.logger.DebugContext(ctx, "Running module", "name", module.Name())
updatedMessage, workDone, err = module.TransformCommitMessage(ctx, branch, commitMessage)
if err != nil {
s.logger.ErrorContext(
ctx, "Failed to transform commit message",
"module", module.Name(),
"error", err,
)
continue
}
if !workDone {
s.logger.DebugContext(
ctx, "Module did not transform commit message",
"module", module.Name(),
)
continue
}
s.logger.DebugContext(
ctx, "Transformed commit message",
"module", module.Name(),
"message", updatedMessage,
)
// ----
// ---- // ----
commitMessage = updatedMessage // ---- pew pew
// ---- // ----
// ----
}
commitMessage = strings.Trim(commitMessage, "\n")
commitMessage = strings.TrimSpace(commitMessage)
if !s.settings.DryRun {
if err := s.gitOps.CreateCommit(commitMessage); err != nil {
s.logger.ErrorContext(ctx, "Failed to create commit", "error", err)
return fmt.Errorf("failed to create commit: %w", err)
}
s.logger.InfoContext(
ctx, "Commit created",
"commit_message", commitMessage,
)
if s.settings.Push {
mrURL, err := s.gitOps.Push()
if err != nil {
s.logger.ErrorContext(ctx, "Failed to push to remote", "error", err)
return fmt.Errorf("failed to push: %w", err)
}
s.logger.InfoContext(ctx, "Successfully pushed to remote")
if mrURL != "" {
s.logger.InfoContext(ctx, "Create merge/pull request", "url", mrURL)
}
}
if s.settings.Tag != "" {
latestTag, err := s.gitOps.GetLatestTag()
if err != nil {
s.logger.ErrorContext(ctx, "Failed to get latest tag", "error", err)
return fmt.Errorf("failed to get latest tag: %w", err)
}
if latestTag == "" {
s.logger.WarnContext(ctx, "No existing tags found, will create first tag")
} else {
s.logger.InfoContext(ctx, "Latest tag found", "tag", latestTag)
}
newTag, err := s.gitOps.IncrementVersion(latestTag, s.settings.Tag)
if err != nil {
s.logger.ErrorContext(ctx, "Failed to increment version", "error", err)
return fmt.Errorf("failed to increment version: %w", err)
}
if err := s.gitOps.CreateTag(newTag, commitMessage); err != nil {
s.logger.ErrorContext(ctx, "Failed to create tag", "tag", newTag, "error", err)
return fmt.Errorf("failed to create tag %s: %w", newTag, err)
}
s.logger.InfoContext(ctx, "Tag created", "tag", newTag)
if s.settings.Push {
if err := s.gitOps.PushTag(newTag); err != nil {
s.logger.ErrorContext(ctx, "Failed to push tag", "tag", newTag, "error", err)
return fmt.Errorf("failed to push tag %s: %w", newTag, err)
}
s.logger.InfoContext(ctx, "Tag pushed to remote", "tag", newTag)
}
}
} else {
s.logger.WarnContext(ctx, "Dry run enabled, no side effects created")
s.logger.InfoContext(ctx, "Final commit message", "message", commitMessage)
}
return nil
}
func (s *Service) getRandomMessage(messages map[string]string) string {
// map provides random access, so we can just return the first message
for _, msg := range messages {
return msg
}
return ""
}
You can’t perform that action at this time.