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
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
|
package sync
import (
"fmt"
"os"
"os/exec"
"path/filepath"
"strings"
"codeberg.org/snonux/gitsyncer/internal/config"
)
// Syncer handles repository synchronization between organizations
type Syncer struct {
config *config.Config
workDir string
repoName string
abandonedReports map[string]*AbandonedBranchReport // Collects reports across repos
branchFilter *BranchFilter // Filter for excluding branches
backupEnabled bool // Whether to sync to backup locations
}
// CLAUDE: Is there a reason, we return a pointer to Syncer?
// New creates a new Syncer instance
func New(cfg *config.Config, workDir string) *Syncer {
// Create branch filter
branchFilter, err := NewBranchFilter(cfg.ExcludeBranches)
if err != nil {
// Log error but continue without filter
fmt.Printf("Warning: Failed to create branch filter: %v\n", err)
branchFilter = &BranchFilter{}
}
return &Syncer{
config: cfg,
workDir: workDir,
abandonedReports: make(map[string]*AbandonedBranchReport),
branchFilter: branchFilter,
backupEnabled: false, // Default to false, will be set via SetBackupEnabled
}
}
// SetBackupEnabled enables or disables syncing to backup locations
func (s *Syncer) SetBackupEnabled(enabled bool) {
s.backupEnabled = enabled
}
// SyncRepository synchronizes a repository across all configured organizations
func (s *Syncer) SyncRepository(repoName string) error {
s.repoName = repoName
// Create work directory if it doesn't exist
if err := os.MkdirAll(s.workDir, 0755); err != nil {
return fmt.Errorf("failed to create work directory: %w", err)
}
// Setup repository (clone or ensure remotes are configured)
repoPath := filepath.Join(s.workDir, repoName)
if err := s.setupRepository(repoPath); err != nil {
return err
}
// Fetch all remotes
fmt.Printf("Fetching updates from all remotes...\n")
if err := s.fetchAll(); err != nil {
return fmt.Errorf("failed to fetch remotes: %w", err)
}
// Get all branches
allBranches, err := s.getAllBranches()
if err != nil {
return fmt.Errorf("failed to get branches: %w", err)
}
// Filter branches based on exclusion patterns
branches := s.branchFilter.FilterBranches(allBranches)
excludedBranches := s.branchFilter.GetExcludedBranches(allBranches)
// Report excluded branches if any
if exclusionReport := FormatExclusionReport(excludedBranches, s.config.ExcludeBranches); exclusionReport != "" {
fmt.Print(exclusionReport)
}
// Get remotes map
remotes := s.getRemotesMap()
// Sync all branches
if err := s.syncAllBranches(branches, remotes); err != nil {
return err
}
// Analyze abandoned branches
report, err := s.analyzeAbandonedBranches()
if err != nil {
// Don't fail sync, just log the error
fmt.Printf("Warning: Failed to analyze abandoned branches: %v\n", err)
} else {
// Store the report for summary
s.abandonedReports[repoName] = report
// Print individual report if not empty
if reportStr := formatAbandonedBranchReport(report, repoName); reportStr != "" {
fmt.Print(reportStr)
}
}
fmt.Printf("\nRepository %s synchronized successfully!\n", repoName)
return nil
}
func (s *Syncer) repoPath() string {
return filepath.Join(s.workDir, s.repoName)
}
// EnsureRepositoryCloned ensures a repository is cloned locally without syncing
// This is used for showcase-only mode
func (s *Syncer) EnsureRepositoryCloned(repoName string) error {
s.repoName = repoName
// Create work directory if it doesn't exist
if err := os.MkdirAll(s.workDir, 0755); err != nil {
return fmt.Errorf("failed to create work directory: %w", err)
}
// Check if repository already exists
repoPath := filepath.Join(s.workDir, repoName)
if _, err := os.Stat(repoPath); err == nil {
// Repository exists, nothing to do
fmt.Printf(" Repository %s already exists locally\n", repoName)
return nil
}
// Repository doesn't exist, clone it
fmt.Printf(" Cloning %s...\n", repoName)
// Find first non-backup organization to clone from
var sourceOrg *config.Organization
for i := range s.config.Organizations {
if !s.config.Organizations[i].BackupLocation {
sourceOrg = &s.config.Organizations[i]
break
}
}
if sourceOrg == nil {
return fmt.Errorf("no non-backup organizations configured to clone from")
}
// Clone the repository
if err := s.cloneRepository(sourceOrg, repoPath); err != nil {
return fmt.Errorf("failed to clone repository: %w", err)
}
fmt.Printf(" Successfully cloned %s\n", repoName)
return nil
}
// cloneRepository clones a repository from an organization
func (s *Syncer) cloneRepository(org *config.Organization, repoPath string) error {
// Skip cloning from backup locations
if org.BackupLocation {
return fmt.Errorf("cannot clone from backup location %s", org.Host)
}
// For file:// URLs, we need special handling
var cloneURL string
if strings.HasPrefix(org.Host, "file://") {
// For local file paths, the format is: file:///path/to/repo.git
cloneURL = fmt.Sprintf("%s/%s.git", org.Host, s.repoName)
} else if org.IsSSH() && org.Name == "" {
// For SSH backup locations: user@host:path/repo.git
cloneURL = fmt.Sprintf("%s/%s.git", org.Host, s.repoName)
} else {
// For SSH URLs, the format is: git@host:org/repo.git
cloneURL = fmt.Sprintf("%s/%s.git", org.GetGitURL(), s.repoName)
}
fmt.Printf("Cloning from %s...\n", cloneURL)
cmd := exec.Command("git", "clone", cloneURL, repoPath)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return err
}
return nil
}
// addRemote adds a remote to the repository
func (s *Syncer) addRemote(repoPath string, org *config.Organization) error {
remoteName := s.getRemoteName(org)
// For file:// URLs, we need special handling
var remoteURL string
if strings.HasPrefix(org.Host, "file://") {
remoteURL = fmt.Sprintf("%s/%s.git", org.Host, s.repoName)
} else if org.IsSSH() && org.Name == "" {
// For SSH backup locations: user@host:path/repo.git
remoteURL = fmt.Sprintf("%s/%s.git", org.Host, s.repoName)
} else {
remoteURL = fmt.Sprintf("%s/%s.git", org.GetGitURL(), s.repoName)
}
fmt.Printf("Adding remote %s: %s\n", remoteName, remoteURL)
cmd := exec.Command("git", "-C", repoPath, "remote", "add", remoteName, remoteURL)
if err := cmd.Run(); err != nil {
return err
}
return nil
}
// fetchAll fetches from all remotes
// Note: We use individual fetches instead of --all to handle missing repositories gracefully
func (s *Syncer) fetchAll() error {
// Get list of remotes
remotes, err := getRemotesList(s.repoPath())
if err != nil {
return err
}
// Check all organizations to identify backup locations
// We need to check ALL orgs, not just active ones
allOrgsMap := make(map[string]*config.Organization)
for i := range s.config.Organizations {
org := &s.config.Organizations[i]
remoteName := s.getRemoteName(org)
allOrgsMap[remoteName] = org
}
// Fetch from each remote
for remote := range remotes {
// Check if this remote is a backup location
if org, exists := allOrgsMap[remote]; exists && org.BackupLocation {
if !s.backupEnabled {
// Silently skip - don't even print a message since backup is not enabled
continue
}
// Even when backup is enabled, we don't fetch from backup locations
fmt.Printf("Skipping fetch from backup location %s\n", remote)
continue
}
fmt.Printf("Fetching %s\n", remote)
if err := fetchRemote(s.repoPath(), remote); err != nil {
return err
}
}
return nil
}
// getAllBranches gets all unique branches from all remotes
func (s *Syncer) getAllBranches() ([]string, error) {
cmd := gitCommand(s.repoPath(), "branch", "-r")
output, err := cmd.Output()
if err != nil {
return nil, err
}
// If backup is disabled, filter out branches from backup locations
if !s.backupEnabled {
filteredOutput := s.filterBackupBranches(output)
return getAllUniqueBranches(filteredOutput), nil
}
return getAllUniqueBranches(output), nil
}
// syncBranch synchronizes a specific branch across all remotes
func (s *Syncer) syncBranch(branch string, remotes map[string]*config.Organization) error {
repoPath := s.repoPath()
// Handle merge conflicts and uncommitted changes
stashed, err := s.handleWorkingDirectoryState()
if err != nil {
return err
}
if stashed {
defer popStash(repoPath)
}
// Create or checkout the branch
if err := s.checkoutBranch(branch); err != nil {
return fmt.Errorf("failed to checkout branch %s: %w", branch, err)
}
// Track which remotes have this branch
remotesWithBranch := s.trackRemotesWithBranch(branch, remotes)
// Merge changes from remotes
if err := mergeFromRemotes(repoPath, branch, remotesWithBranch); err != nil {
return err
}
// Push to all remotes
return pushToAllRemotes(repoPath, branch, remotes, remotesWithBranch)
}
// handleWorkingDirectoryState checks for conflicts and stashes changes if needed
// Returns true if changes were stashed
func (s *Syncer) handleWorkingDirectoryState() (bool, error) {
repoPath := s.repoPath()
hasConflicts, statusStr, err := checkForMergeConflicts(repoPath)
if err != nil || statusStr == "" {
return false, nil
}
if hasConflicts {
// Get absolute path for clarity
absPath, err := filepath.Abs(repoPath)
if err != nil {
absPath = repoPath
}
return false, fmt.Errorf("repository has unresolved merge conflicts\nPlease resolve conflicts in: %s\nOr delete the directory to start fresh: rm -rf %s", absPath, absPath)
}
// If we have uncommitted changes but no conflicts, try to stash them
if err := stashChanges(repoPath); err != nil {
return false, fmt.Errorf("failed to stash changes: %w", err)
}
return true, nil
}
// checkoutBranch checks out a branch, creating it if necessary
func (s *Syncer) checkoutBranch(branch string) error {
// First try to checkout existing branch
if err := checkoutExistingBranch(s.repoPath(), branch); err == nil {
return nil
}
// If that fails, create a new branch tracking the first remote that has it
for i := range s.config.Organizations {
org := &s.config.Organizations[i]
remoteName := s.getRemoteName(org)
if s.remoteBranchExists(remoteName, branch) {
return createTrackingBranch(s.repoPath(), branch, remoteName)
}
}
return fmt.Errorf("branch %s not found on any remote", branch)
}
// remoteBranchExists checks if a branch exists on a remote
func (s *Syncer) remoteBranchExists(remoteName, branch string) bool {
cmd := gitCommand(s.repoPath(), "branch", "-r", "--list", fmt.Sprintf("%s/%s", remoteName, branch))
output, err := cmd.Output()
if err != nil {
return false
}
return strings.TrimSpace(string(output)) != ""
}
// getRemoteName generates a remote name for an organization
func (s *Syncer) getRemoteName(org *config.Organization) string {
// Use the host without git@ or file:// prefix as remote name
host := org.Host
host = strings.TrimPrefix(host, "git@")
host = strings.TrimPrefix(host, "file://")
host = strings.ReplaceAll(host, ":", "_")
host = strings.ReplaceAll(host, ".", "_")
host = strings.ReplaceAll(host, "/", "_")
// For file URLs, create a simpler name
if strings.HasPrefix(org.Host, "file://") {
// Get the last part of the path
parts := strings.Split(strings.TrimPrefix(org.Host, "file://"), "/")
if len(parts) > 0 {
return parts[len(parts)-1]
}
}
return host
}
// filterBackupBranches filters out branches from backup locations
func (s *Syncer) filterBackupBranches(output []byte) []byte {
lines := strings.Split(string(output), "\n")
var filtered []string
for _, line := range lines {
line = strings.TrimSpace(line)
if line == "" {
continue
}
// Check if this branch is from a backup remote
isBackup := false
for i := range s.config.Organizations {
org := &s.config.Organizations[i]
if org.BackupLocation {
remoteName := s.getRemoteName(org)
if strings.HasPrefix(line, remoteName+"/") {
isBackup = true
break
}
}
}
if !isBackup {
filtered = append(filtered, line)
}
}
return []byte(strings.Join(filtered, "\n"))
}
|