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
|
package bug
import (
"fmt"
"io"
"io/ioutil"
"strings"
"github.com/MichaelMure/git-bug/repository"
)
const MsgMergeNew = "new"
const MsgMergeInvalid = "invalid data"
const MsgMergeUpdated = "updated"
const MsgMergeNothing = "nothing to do"
// Fetch retrieve update from a remote
// This does not change the local bugs state
func Fetch(repo repository.Repo, remote string) (string, error) {
remoteRefSpec := fmt.Sprintf(bugsRemoteRefPattern, remote)
fetchRefSpec := fmt.Sprintf("%s*:%s*", bugsRefPattern, remoteRefSpec)
return repo.FetchRefs(remote, fetchRefSpec)
}
// Push update a remote with the local changes
func Push(repo repository.Repo, remote string) (string, error) {
return repo.PushRefs(remote, bugsRefPattern+"*")
}
// Pull does a Fetch and merge the updates into the local bug states
func Pull(repo repository.Repo, out io.Writer, remote string) error {
// TODO: return a chan of changes for the cache to be updated properly
if out == nil {
out = ioutil.Discard
}
fmt.Fprintf(out, "Fetching remote ...\n")
stdout, err := Fetch(repo, remote)
if err != nil {
return err
}
out.Write([]byte(stdout))
fmt.Fprintf(out, "Merging data ...\n")
for merge := range MergeAll(repo, remote) {
if merge.Err != nil {
return merge.Err
}
if merge.Status != MsgMergeNothing {
fmt.Fprintf(out, "%s: %s\n", merge.HumanId, merge.Status)
}
}
return nil
}
type MergeResult struct {
Err error
Id string
HumanId string
Status string
}
func newMergeError(id string, err error) MergeResult {
return MergeResult{
Id: id,
HumanId: formatHumanId(id),
Status: err.Error(),
}
}
func newMergeStatus(id string, status string) MergeResult {
return MergeResult{
Id: id,
HumanId: formatHumanId(id),
Status: status,
}
}
func MergeAll(repo repository.Repo, remote string) <-chan MergeResult {
out := make(chan MergeResult)
go func() {
defer close(out)
remoteRefSpec := fmt.Sprintf(bugsRemoteRefPattern, remote)
remoteRefs, err := repo.ListRefs(remoteRefSpec)
if err != nil {
out <- MergeResult{Err: err}
return
}
for _, remoteRef := range remoteRefs {
refSplitted := strings.Split(remoteRef, "/")
id := refSplitted[len(refSplitted)-1]
remoteBug, err := readBug(repo, remoteRef)
if err != nil {
out <- newMergeError(id, err)
continue
}
// Check for error in remote data
if !remoteBug.IsValid() {
out <- newMergeStatus(id, MsgMergeInvalid)
continue
}
localRef := bugsRefPattern + remoteBug.Id()
localExist, err := repo.RefExist(localRef)
if err != nil {
out <- newMergeError(id, err)
continue
}
// the bug is not local yet, simply create the reference
if !localExist {
err := repo.CopyRef(remoteRef, localRef)
if err != nil {
out <- newMergeError(id, err)
return
}
out <- newMergeStatus(id, MsgMergeNew)
continue
}
localBug, err := readBug(repo, localRef)
if err != nil {
out <- newMergeError(id, err)
return
}
updated, err := localBug.Merge(repo, remoteBug)
if err != nil {
out <- newMergeError(id, err)
return
}
if updated {
out <- newMergeStatus(id, MsgMergeUpdated)
} else {
out <- newMergeStatus(id, MsgMergeNothing)
}
}
}()
return out
}
|
