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
|
package main
import (
"fmt"
"github.com/jroimartin/gocui"
"github.com/mkchoi212/fac/color"
"github.com/mkchoi212/fac/conflict"
)
const (
Current = "current"
Foreign = "foreign"
Panel = "panel"
Prompt = "prompt"
Input = "input prompt"
Local = 1
Incoming = 2
Up = 3
Down = 4
Horizontal = 5
Vertical = -6
)
var (
ViewOrientation = Vertical
inputHeight = 2
)
func layout(g *gocui.Gui) (err error) {
if err = makePanels(g); err != nil {
return
}
if err = makeOverviewPanel(g); err != nil {
return
}
if err = makePrompt(g); err != nil {
return
}
return
}
func makePanels(g *gocui.Gui) error {
maxX, maxY := g.Size()
viewHeight := maxY - inputHeight
branchViewWidth := (maxX / 5) * 2
isOdd := maxY%2 == 1
var x0, x1, y0, y1 int
var x2, x3, y2, y3 int
if ViewOrientation == Horizontal {
x0, x1 = 0, branchViewWidth
y0, y1 = 0, viewHeight
x2, x3 = branchViewWidth, branchViewWidth*2
y2, y3 = 0, viewHeight
} else {
branchViewWidth = branchViewWidth * 2
viewHeight = (maxY - inputHeight) / 2
x0, x1 = 0, branchViewWidth
y0, y1 = 0, viewHeight
x2, x3 = 0, branchViewWidth
y2, y3 = viewHeight, viewHeight*2
if isOdd {
y3++
}
}
if v, err := g.SetView(Current, x0, y0, x1, y1); err != nil {
if err != gocui.ErrUnknownView {
return err
}
v.Wrap = true
}
if v, err := g.SetView(Foreign, x2, y2, x3, y3); err != nil {
if err != gocui.ErrUnknownView {
return err
}
v.Wrap = true
}
return nil
}
func makeOverviewPanel(g *gocui.Gui) error {
maxX, maxY := g.Size()
viewHeight := maxY - inputHeight
branchViewWidth := (maxX / 5) * 2
if v, err := g.SetView(Panel, branchViewWidth*2, 0, maxX-2, viewHeight); err != nil {
if err != gocui.ErrUnknownView {
return err
}
v.Title = "Conflicts"
}
return nil
}
func makePrompt(g *gocui.Gui) error {
maxX, maxY := g.Size()
inputHeight := 2
viewHeight := maxY - inputHeight
// Instruction View
if v, err := g.SetView(Prompt, 0, viewHeight, 19, viewHeight+inputHeight); err != nil {
if err != gocui.ErrUnknownView {
return err
}
v.Frame = false
prompt := color.Green(color.Regular, promptString)
v.Write([]byte(prompt))
v.MoveCursor(11, 0, true)
}
// Input View
if v, err := g.SetView(Input, 15, viewHeight, maxX, viewHeight+inputHeight); err != nil {
if err != gocui.ErrUnknownView {
return err
}
v.Frame = false
v.Editable = true
v.Wrap = false
v.Editor = gocui.EditorFunc(promptEditor)
if _, err := g.SetCurrentView(Input); err != nil {
return err
}
}
return nil
}
func Select(c *conflict.Conflict, g *gocui.Gui, showHelp bool) error {
g.Update(func(g *gocui.Gui) error {
v, err := g.View(Panel)
if err != nil {
return err
}
v.Clear()
for idx, conflict := range conflict.All {
var out string
if conflict.Choice != 0 {
out = color.Green(color.Regular, "✔ %s:%d", conflict.FileName, conflict.Start)
} else {
out = color.Red(color.Regular, "%d. %s:%d", idx+1, conflict.FileName, conflict.Start)
}
if conflict.Equal(c) {
fmt.Fprintf(v, "-> %s\n", out)
} else {
fmt.Fprintf(v, "%s\n", out)
}
}
if showHelp {
printHelp(v)
}
return nil
})
g.Update(func(g *gocui.Gui) error {
v, err := g.View(Current)
if err != nil {
return err
}
v.Title = fmt.Sprintf("%s %s", c.CurrentName, "(Local Version)")
top, bottom := c.PaddingLines()
v.Clear()
printLines(v, top)
if c.DisplayDiff {
printLines(v, c.Diff())
} else {
printLines(v, c.ColoredLocalLines)
}
printLines(v, bottom)
if c.Choice == Local {
v.FgColor = gocui.ColorGreen
}
v, err = g.View(Foreign)
if err != nil {
return err
}
v.Title = fmt.Sprintf("%s %s", c.ForeignName, "(Incoming Version)")
top, bottom = c.PaddingLines()
v.Clear()
printLines(v, top)
printLines(v, c.ColoredIncomingLines)
printLines(v, bottom)
if c.Choice == Incoming {
v.FgColor = gocui.ColorGreen
}
return nil
})
return nil
}
func Resolve(c *conflict.Conflict, g *gocui.Gui, v *gocui.View, version int) error {
g.Update(func(g *gocui.Gui) error {
c.Choice = version
MoveToItem(Down, g, v)
return nil
})
return nil
}
func MoveToItem(dir int, g *gocui.Gui, v *gocui.View) error {
originalCur := cur
for {
if dir == Up {
cur--
} else {
cur++
}
if cur >= conflict.Count {
cur = 0
} else if cur < 0 {
cur = conflict.Count - 1
}
if conflict.All[cur].Choice == 0 || originalCur == cur {
break
}
}
if originalCur == cur && conflict.All[cur].Choice != 0 {
globalQuit(g)
}
Select(&conflict.All[cur], g, false)
return nil
}
func Scroll(g *gocui.Gui, c *conflict.Conflict, direction int) {
if direction == Up {
c.TopPeek--
c.BottomPeek++
} else if direction == Down {
c.TopPeek++
} else {
return
}
|
