-
Notifications
You must be signed in to change notification settings - Fork 11
/
Copy pathbranchspec.go
347 lines (314 loc) · 10 KB
/
branchspec.go
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
// Copyright 2019 Preferred Networks, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package types
import (
"os"
"path/filepath"
"strings"
"github.com/pfnet-research/git-ghost/pkg/ghost/git"
"github.com/pfnet-research/git-ghost/pkg/util"
"github.com/pfnet-research/git-ghost/pkg/util/errors"
multierror "github.com/hashicorp/go-multierror"
log "github.com/sirupsen/logrus"
)
// GhostBranchSpec is an interface
//
// GhostBranchSpec is a specification for creating ghost branch
type GhostBranchSpec interface {
// CreateBranch create a ghost branch on WorkingEnv and returns a GhostBranch object
CreateBranch(we WorkingEnv) (GhostBranch, errors.GitGhostError)
}
// PullableGhostBranchSpec is an interface
//
// PullableGhostBranchSpec is a specification for pulling ghost branch from ghost repo
type PullableGhostBranchSpec interface {
// PullBranch pulls a ghost branch on from ghost repo in WorkingEnv and returns a GhostBranch object
PullBranch(we WorkingEnv) (GhostBranch, errors.GitGhostError)
}
// ensuring interfaces
var _ GhostBranchSpec = CommitsBranchSpec{}
var _ GhostBranchSpec = DiffBranchSpec{}
var _ PullableGhostBranchSpec = CommitsBranchSpec{}
var _ PullableGhostBranchSpec = PullableDiffBranchSpec{}
// Constants
const maxSymlinkDepth = 3
// CommitsBranchSpec is a spec for creating local base branch
type CommitsBranchSpec struct {
Prefix string
CommittishFrom string
CommittishTo string
}
// DiffBranchSpec is a spec for creating local mod branch
type DiffBranchSpec struct {
Prefix string
CommittishFrom string
IncludedFilepaths []string
FollowSymlinks bool
}
// PullableDiffBranchSpec is a spec for pulling local base branch
type PullableDiffBranchSpec struct {
Prefix string
CommittishFrom string
DiffHash string
}
// Resolve resolves committish in DiffBranchSpec as full commit hash values
func (bs CommitsBranchSpec) Resolve(srcDir string) (*CommitsBranchSpec, errors.GitGhostError) {
err := git.ValidateCommittish(srcDir, bs.CommittishFrom)
if err != nil {
return nil, err
}
commitHashFrom := resolveCommittishOr(srcDir, bs.CommittishFrom)
err = git.ValidateCommittish(srcDir, bs.CommittishTo)
if err != nil {
return nil, err
}
commitHashTo := resolveCommittishOr(srcDir, bs.CommittishTo)
branch := &CommitsBranchSpec{
Prefix: bs.Prefix,
CommittishFrom: commitHashFrom,
CommittishTo: commitHashTo,
}
return branch, nil
}
// PullBranch pulls a ghost branch on from ghost repo in WorkingEnv and returns a GhostBranch object
func (bs CommitsBranchSpec) PullBranch(we WorkingEnv) (GhostBranch, errors.GitGhostError) {
resolved, err := bs.Resolve(we.SrcDir)
if err != nil {
return nil, err
}
branch := &CommitsBranch{
Prefix: resolved.Prefix,
CommitHashFrom: resolved.CommittishFrom,
CommitHashTo: resolved.CommittishTo,
}
err = pull(branch, we)
if err != nil {
return nil, err
}
return branch, nil
}
// CreateBranch create a ghost branch on WorkingEnv and returns a GhostBranch object
func (bs CommitsBranchSpec) CreateBranch(we WorkingEnv) (GhostBranch, errors.GitGhostError) {
dstDir := we.GhostDir
srcDir := we.SrcDir
resolved, ggerr := bs.Resolve(we.SrcDir)
if ggerr != nil {
return nil, ggerr
}
commitHashFrom := resolved.CommittishFrom
commitHashTo := resolved.CommittishTo
branch := CommitsBranch{
Prefix: resolved.Prefix,
CommitHashFrom: commitHashFrom,
CommitHashTo: commitHashTo,
}
tmpFile, err := os.CreateTemp("", "git-ghost-local-base")
if err != nil {
return nil, errors.WithStack(err)
}
util.LogDeferredError(tmpFile.Close)
defer util.LogDeferredError(func() error { return os.Remove(tmpFile.Name()) })
ggerr = git.CreateDiffBundleFile(srcDir, tmpFile.Name(), commitHashFrom, commitHashTo)
if ggerr != nil {
return nil, ggerr
}
err = os.Rename(tmpFile.Name(), filepath.Join(dstDir, branch.FileName()))
if err != nil {
return nil, errors.WithStack(err)
}
ggerr = git.CreateOrphanBranch(dstDir, branch.BranchName())
if ggerr != nil {
return nil, ggerr
}
ggerr = git.CommitFile(dstDir, branch.FileName(), "Create ghost commit")
if ggerr != nil {
return nil, ggerr
}
return &branch, nil
}
// Resolve resolves committish in DiffBranchSpec as full commit hash values
func (bs DiffBranchSpec) Resolve(srcDir string) (*DiffBranchSpec, errors.GitGhostError) {
err := git.ValidateCommittish(srcDir, bs.CommittishFrom)
if err != nil {
return nil, err
}
commitHashFrom := resolveCommittishOr(srcDir, bs.CommittishFrom)
var errs error
includedFilepaths := make([]string, 0, len(bs.IncludedFilepaths))
for _, p := range bs.IncludedFilepaths {
resolved, err := resolveFilepath(srcDir, p)
if err != nil {
errs = multierror.Append(errs, err)
continue
}
includedFilepaths = append(includedFilepaths, resolved)
if bs.FollowSymlinks {
islink, err := util.IsSymlink(p)
if err != nil {
errs = multierror.Append(errs, err)
continue
}
if islink {
err := util.WalkSymlink(srcDir, p, func(paths []string, pp string) errors.GitGhostError {
if len(paths) > maxSymlinkDepth {
return errors.Errorf("symlink is too deep (< %d): %s", maxSymlinkDepth, strings.Join(paths, " -> "))
}
if filepath.IsAbs(pp) {
return errors.Errorf("symlink to absolute path is not supported: %s -> %s", strings.Join(paths, " -> "), pp)
}
resolved, err := resolveFilepath(srcDir, pp)
if err != nil {
return errors.WithStack(err)
}
includedFilepaths = append(includedFilepaths, resolved)
return nil
})
if err != nil {
errs = multierror.Append(errs, err)
continue
}
}
}
}
if errs != nil {
return nil, errors.WithStack(errs)
}
if len(includedFilepaths) > 0 {
includedFilepaths = util.UniqueStringSlice(includedFilepaths)
}
return &DiffBranchSpec{
Prefix: bs.Prefix,
CommittishFrom: commitHashFrom,
IncludedFilepaths: includedFilepaths,
}, nil
}
// CreateBranch create a ghost branch on WorkingEnv and returns a GhostBranch object
func (bs DiffBranchSpec) CreateBranch(we WorkingEnv) (GhostBranch, errors.GitGhostError) {
dstDir := we.GhostDir
srcDir := we.SrcDir
resolved, ggerr := bs.Resolve(we.SrcDir)
if ggerr != nil {
return nil, ggerr
}
commitHashFrom := resolved.CommittishFrom
tmpFile, err := os.CreateTemp("", "git-ghost-local-mod")
if err != nil {
return nil, errors.WithStack(err)
}
util.LogDeferredError(tmpFile.Close)
defer util.LogDeferredError(func() error { return os.Remove(tmpFile.Name()) })
err = git.CreateDiffPatchFile(srcDir, tmpFile.Name(), commitHashFrom)
if err != nil {
return nil, errors.WithStack(err)
}
if len(bs.IncludedFilepaths) > 0 {
err = git.AppendNonIndexedDiffFiles(srcDir, tmpFile.Name(), resolved.IncludedFilepaths)
if err != nil {
return nil, errors.WithStack(err)
}
}
hash, err := util.GenerateFileContentHash(tmpFile.Name())
if err != nil {
return nil, errors.WithStack(err)
}
branch := DiffBranch{
Prefix: resolved.Prefix,
CommitHashFrom: commitHashFrom,
DiffHash: hash,
}
err = os.Rename(tmpFile.Name(), filepath.Join(dstDir, branch.FileName()))
if err != nil {
return nil, errors.WithStack(err)
}
err = git.CreateOrphanBranch(dstDir, branch.BranchName())
if err != nil {
return nil, errors.WithStack(err)
}
err = git.CommitFile(dstDir, branch.FileName(), "Create ghost commit")
if err != nil {
return nil, errors.WithStack(err)
}
return &branch, nil
}
// Resolve resolves committish in PullableDiffBranchSpec as full commit hash values
func (bs PullableDiffBranchSpec) Resolve(srcDir string) (*PullableDiffBranchSpec, errors.GitGhostError) {
err := git.ValidateCommittish(srcDir, bs.CommittishFrom)
if err != nil {
return nil, errors.WithStack(err)
}
commitHashFrom := resolveCommittishOr(srcDir, bs.CommittishFrom)
return &PullableDiffBranchSpec{
Prefix: bs.Prefix,
CommittishFrom: commitHashFrom,
DiffHash: bs.DiffHash,
}, nil
}
// PullBranch pulls a ghost branch on from ghost repo in WorkingEnv and returns a GhostBranch object
func (bs PullableDiffBranchSpec) PullBranch(we WorkingEnv) (GhostBranch, errors.GitGhostError) {
resolved, err := bs.Resolve(we.SrcDir)
if err != nil {
return nil, err
}
branch := &DiffBranch{
Prefix: resolved.Prefix,
CommitHashFrom: resolved.CommittishFrom,
DiffHash: bs.DiffHash,
}
err = pull(branch, we)
if err != nil {
return nil, err
}
return branch, nil
}
func pull(ghost GhostBranch, we WorkingEnv) errors.GitGhostError {
return git.ResetHardToBranch(we.GhostDir, git.ORIGIN+"/"+ghost.BranchName())
}
func resolveCommittishOr(srcDir string, committishToResolve string) string {
resolved, err := git.ResolveCommittish(srcDir, committishToResolve)
if err != nil {
log.WithFields(log.Fields{
"repository": srcDir,
"specified": committishToResolve,
}).Warn("can't resolve commit-ish value on local git repository. specified commit-ish value will be used.")
return committishToResolve
}
return resolved
}
func resolveFilepath(dir, p string) (string, errors.GitGhostError) {
absp := p
if !filepath.IsAbs(p) {
absp = filepath.Clean(filepath.Join(dir, p))
}
relp, err := filepath.Rel(dir, absp)
if err != nil {
return "", errors.WithStack(err)
}
log.WithFields(log.Fields{
"dir": dir,
"path": p,
"absp": absp,
"relp": relp,
}).Debugf("resolved path")
if strings.HasPrefix(relp, "../") {
return "", errors.Errorf("%s is not located in the source directory", p)
}
isdir, err := util.IsDir(relp)
if err != nil {
return "", errors.WithStack(err)
}
if isdir {
return "", errors.Errorf("directory diff is not supported: %s", p)
}
return relp, nil
}