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
|
// +build static,system_libgit2
package conflicts
import (
"os"
"testing"
"github.com/stretchr/testify/require"
cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
)
func TestMain(m *testing.M) {
defer testhelper.MustHaveNoChildProcess()
testhelper.Configure()
testhelper.ConfigureGitalyGit2Go()
os.Exit(m.Run())
}
func TestConflicts(t *testing.T) {
testcases := []struct {
desc string
base map[string]string
ours map[string]string
theirs map[string]string
conflicts []git2go.Conflict
}{
{
desc: "no conflicts",
base: map[string]string{
"file": "a",
},
ours: map[string]string{
"file": "a",
},
theirs: map[string]string{
"file": "b",
},
conflicts: nil,
},
{
desc: "single file",
base: map[string]string{
"file": "a",
},
ours: map[string]string{
"file": "b",
},
theirs: map[string]string{
"file": "c",
},
conflicts: []git2go.Conflict{
{
Ancestor: git2go.ConflictEntry{Path: "file", Mode: 0100644},
Our: git2go.ConflictEntry{Path: "file", Mode: 0100644},
Their: git2go.ConflictEntry{Path: "file", Mode: 0100644},
Content: []byte("<<<<<<< file\nb\n=======\nc\n>>>>>>> file\n"),
},
},
},
{
desc: "multiple files with single conflict",
base: map[string]string{
"file-1": "a",
"file-2": "a",
},
ours: map[string]string{
"file-1": "b",
"file-2": "b",
},
theirs: map[string]string{
"file-1": "a",
"file-2": "c",
},
conflicts: []git2go.Conflict{
{
Ancestor: git2go.ConflictEntry{Path: "file-2", Mode: 0100644},
Our: git2go.ConflictEntry{Path: "file-2", Mode: 0100644},
Their: git2go.ConflictEntry{Path: "file-2", Mode: 0100644},
Content: []byte("<<<<<<< file-2\nb\n=======\nc\n>>>>>>> file-2\n"),
},
},
},
{
desc: "multiple conflicts",
base: map[string]string{
"file-1": "a",
"file-2": "a",
},
ours: map[string]string{
"file-1": "b",
"file-2": "b",
},
theirs: map[string]string{
"file-1": "c",
"file-2": "c",
},
conflicts: []git2go.Conflict{
{
Ancestor: git2go.ConflictEntry{Path: "file-1", Mode: 0100644},
Our: git2go.ConflictEntry{Path: "file-1", Mode: 0100644},
Their: git2go.ConflictEntry{Path: "file-1", Mode: 0100644},
Content: []byte("<<<<<<< file-1\nb\n=======\nc\n>>>>>>> file-1\n"),
},
{
Ancestor: git2go.ConflictEntry{Path: "file-2", Mode: 0100644},
Our: git2go.ConflictEntry{Path: "file-2", Mode: 0100644},
Their: git2go.ConflictEntry{Path: "file-2", Mode: 0100644},
Content: []byte("<<<<<<< file-2\nb\n=======\nc\n>>>>>>> file-2\n"),
},
},
},
{
desc: "modified-delete-conflict",
base: map[string]string{
"file": "content",
},
ours: map[string]string{
"file": "changed",
},
theirs: map[string]string{
"different-file": "unrelated",
},
conflicts: []git2go.Conflict{
{
Ancestor: git2go.ConflictEntry{Path: "file", Mode: 0100644},
Our: git2go.ConflictEntry{Path: "file", Mode: 0100644},
Their: git2go.ConflictEntry{},
Content: []byte("<<<<<<< file\nchanged\n=======\n>>>>>>> \n"),
},
},
},
{
// Ruby code doesn't call `merge_commits` with rename
// detection and so don't we. The rename conflict is
// thus split up into three conflicts.
desc: "rename-rename-conflict",
base: map[string]string{
"file": "a\nb\nc\nd\ne\nf\ng\n",
},
ours: map[string]string{
"renamed-1": "a\nb\nc\nd\ne\nf\ng\n",
},
theirs: map[string]string{
"renamed-2": "a\nb\nc\nd\ne\nf\ng\n",
},
conflicts: []git2go.Conflict{
{
Ancestor: git2go.ConflictEntry{Path: "file", Mode: 0100644},
Our: git2go.ConflictEntry{},
Their: git2go.ConflictEntry{},
Content: []byte{},
},
{
Ancestor: git2go.ConflictEntry{},
Our: git2go.ConflictEntry{Path: "renamed-1", Mode: 0100644},
Their: git2go.ConflictEntry{},
Content: []byte("a\nb\nc\nd\ne\nf\ng\n"),
},
{
Ancestor: git2go.ConflictEntry{},
Our: git2go.ConflictEntry{},
Their: git2go.ConflictEntry{Path: "renamed-2", Mode: 0100644},
Content: []byte("a\nb\nc\nd\ne\nf\ng\n"),
},
},
},
}
for _, tc := range testcases {
_, repoPath, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
base := cmdtesthelper.BuildCommit(t, repoPath, nil, tc.base)
ours := cmdtesthelper.BuildCommit(t, repoPath, base, tc.ours)
theirs := cmdtesthelper.BuildCommit(t, repoPath, base, tc.theirs)
t.Run(tc.desc, func(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
response, err := git2go.ConflictsCommand{
Repository: repoPath,
Ours: ours.String(),
Theirs: theirs.String(),
}.Run(ctx, config.Config)
require.NoError(t, err)
require.Equal(t, tc.conflicts, response.Conflicts)
})
}
}
|
