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
|
package sync
import (
"fmt"
"codeberg.org/snonux/gitsyncer/internal/config"
)
// trackRemotesWithBranch finds which remotes have a specific branch
func (s *Syncer) trackRemotesWithBranch(branch string, remotes map[string]*config.Organization) map[string]bool {
remotesWithBranch := make(map[string]bool)
for remoteName, org := range remotes {
// Skip checking backup locations as we don't sync from them
if org.BackupLocation {
continue
}
if s.remoteBranchExists(remoteName, branch) {
remotesWithBranch[remoteName] = true
}
}
return remotesWithBranch
}
// mergeFromRemotes merges changes from all remotes that have the branch
func mergeFromRemotes(repoPath, branch string, remotesWithBranch map[string]bool) error {
if len(remotesWithBranch) == 0 {
fmt.Printf(" Branch %s is local only, will push to all remotes\n", branch)
return nil
}
// Merge changes from all remotes that have this branch
for remoteName := range remotesWithBranch {
if err := mergeBranch(repoPath, remoteName, branch); err != nil {
return err
}
}
return nil
}
// handlePushError decides whether a push error should stop sync or only disable backup for this session.
func (s *Syncer) handlePushError(remoteName string, org *config.Organization, err error) error {
if err == nil {
return nil
}
if org != nil && org.BackupLocation {
s.disableBackupForSession(remoteName, err)
return nil
}
return err
}
// pushToAllRemotes pushes the branch to all configured remotes
func (s *Syncer) pushToAllRemotes(repoPath, branch string, remotes map[string]*config.Organization, remotesWithBranch map[string]bool) error {
for remoteName, org := range remotes {
if org.BackupLocation && !s.backupActive() {
continue
}
// Check if this remote has the branch
remoteHasBranch := remotesWithBranch[remoteName]
if !remoteHasBranch {
fmt.Printf(" Creating branch on %s (%s)...\n", remoteName, org.Host)
} else {
fmt.Printf(" Pushing to %s (%s)...\n", remoteName, org.Host)
}
if err := s.handlePushError(remoteName, org, pushBranchWithBackupSupport(repoPath, remoteName, branch, remoteHasBranch, org)); err != nil {
return err
}
}
return nil
}
// syncAllBranches synchronizes all branches across remotes
func (s *Syncer) syncAllBranches(branches []string, remotes map[string]*config.Organization) error {
for _, branch := range branches {
fmt.Printf("\nSyncing branch: %s\n", branch)
if err := s.syncBranch(branch, remotes); err != nil {
return fmt.Errorf("failed to sync branch %s: %w", branch, err)
}
}
return nil
}
|
