forked from splitsh/lite
/
state.go
551 lines (455 loc) · 11.1 KB
/
state.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
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
package splitter
import (
"fmt"
"log"
"os"
"strings"
"sync"
"time"
"github.com/libgit2/git2go"
)
type state struct {
config *Config
originBranch string
repoMu *sync.Mutex
repo *git.Repository
cache *cache
logger *log.Logger
simplePrefix string
result *Result
}
func newState(config *Config, result *Result) (*state, error) {
var err error
// validate config
if err = config.Validate(); err != nil {
return nil, err
}
state := &state{
config: config,
result: result,
repoMu: config.RepoMu,
repo: config.Repo,
logger: config.Logger,
}
if state.repo == nil {
if state.repo, err = git.OpenRepository(config.Path); err != nil {
return nil, err
}
}
if state.repoMu == nil {
state.repoMu = &sync.Mutex{}
}
if state.logger == nil {
state.logger = log.New(os.Stderr, "", log.LstdFlags)
}
if state.originBranch, err = normalizeOriginBranch(state.repo, config.Origin); err != nil {
return nil, err
}
if state.cache, err = newCache(state.originBranch, config); err != nil {
return nil, err
}
if config.Debug {
state.logger.Printf("Splitting %s\n", state.originBranch)
for _, v := range config.Prefixes {
to := v.To
if to == "" {
to = "ROOT"
}
state.logger.Printf(" From \"%s\" to \"%s\"\n", v.From, to)
}
}
if config.Scratch {
if err := state.flush(); err != nil {
return nil, err
}
}
// simplePrefix contains the prefix when there is only one
// with an empty value (target)
if len(config.Prefixes) == 1 && config.Prefixes[0].To == "" {
state.simplePrefix = config.Prefixes[0].From
}
return state, nil
}
func (s *state) close() error {
err := s.cache.close()
if err != nil {
return err
}
s.repo.Free()
return nil
}
func (s *state) flush() error {
if err := s.cache.flush(); err != nil {
return err
}
if s.config.Target != "" {
branch, err := s.repo.LookupBranch(s.config.Target, git.BranchLocal)
if err == nil {
branch.Delete()
branch.Free()
}
}
return nil
}
func (s *state) split() error {
startTime := time.Now()
defer func() {
s.result.end(startTime)
}()
revWalk, err := s.walker()
if err != nil {
return fmt.Errorf("Impossible to walk the repository: %s", err)
}
defer revWalk.Free()
var iterationErr error
var lastRev *git.Oid
err = revWalk.Iterate(func(rev *git.Commit) bool {
defer rev.Free()
lastRev = rev.Id()
if s.config.Debug {
s.logger.Printf("Processing commit: %s\n", rev.Id().String())
}
var newrev *git.Oid
newrev, err = s.splitRev(rev)
if err != nil {
iterationErr = err
return false
}
if newrev != nil {
s.result.moveHead(newrev)
}
return true
})
if err != nil {
return err
}
if iterationErr != nil {
return iterationErr
}
if lastRev != nil {
s.cache.setHead(lastRev)
}
return s.updateTarget()
}
func (s *state) walker() (*git.RevWalk, error) {
revWalk, err := s.repo.Walk()
if err != nil {
return nil, fmt.Errorf("Impossible to walk the repository: %s", err)
}
err = s.pushRevs(revWalk)
if err != nil {
return nil, fmt.Errorf("Impossible to determine split range: %s", err)
}
revWalk.Sorting(git.SortTopological | git.SortReverse)
return revWalk, nil
}
func (s *state) splitRev(rev *git.Commit) (*git.Oid, error) {
s.result.incTraversed()
v := s.cache.get(rev.Id())
if v != nil {
if s.config.Debug {
s.logger.Printf(" prior: %s\n", v.String())
}
return v, nil
}
var parents []*git.Oid
var n uint
for n = 0; n < rev.ParentCount(); n++ {
parents = append(parents, rev.ParentId(n))
}
if s.config.Debug {
debugMsg := " parents:"
for _, parent := range parents {
debugMsg += fmt.Sprintf(" %s", parent.String())
}
s.logger.Print(debugMsg)
}
newParents := s.cache.gets(parents)
if s.config.Debug {
debugMsg := " newparents:"
for _, parent := range newParents {
debugMsg += fmt.Sprintf(" %s", parent)
}
s.logger.Print(debugMsg)
}
tree, err := s.subtreeForCommit(rev)
if err != nil {
return nil, err
}
if nil == tree {
// should never happen
return nil, nil
}
defer tree.Free()
if s.config.Debug {
s.logger.Printf(" tree is: %s\n", tree.Id().String())
}
newrev, created, err := s.copyOrSkip(rev, tree, newParents)
if err != nil {
return nil, err
}
if s.config.Debug {
s.logger.Printf(" newrev is: %s\n", newrev)
}
if created {
s.result.incCreated()
}
if err := s.cache.set(rev.Id(), newrev, created); err != nil {
return nil, err
}
return newrev, nil
}
func (s *state) subtreeForCommit(commit *git.Commit) (*git.Tree, error) {
tree, err := commit.Tree()
if err != nil {
return nil, err
}
defer tree.Free()
if s.simplePrefix != "" {
return s.treeByPath(tree, s.simplePrefix)
}
return s.treeByPaths(tree, s.config.Prefixes)
}
func (s *state) treeByPath(tree *git.Tree, prefix string) (*git.Tree, error) {
treeEntry, err := tree.EntryByPath(prefix)
if err != nil {
return nil, nil
}
if treeEntry.Type != git.ObjectTree {
// tree is not a tree (a directory for a gitmodule for instance), skip
return nil, nil
}
return s.repo.LookupTree(treeEntry.Id)
}
func (s *state) treeByPaths(tree *git.Tree, prefixes []*Prefix) (*git.Tree, error) {
var currentTree, prefixedTree, mergedTree *git.Tree
for _, prefix := range s.config.Prefixes {
// splitting
splitTree, err := s.treeByPath(tree, prefix.From)
if err != nil {
return nil, err
}
if splitTree == nil {
continue
}
// adding the prefix
if prefix.To != "" {
prefixedTree, err = s.addPrefixToTree(splitTree, prefix.To)
if err != nil {
return nil, err
}
} else {
prefixedTree = splitTree
}
// merging with the current tree
if currentTree != nil {
mergedTree, err = s.mergeTrees(currentTree, prefixedTree)
currentTree.Free()
prefixedTree.Free()
if err != nil {
return nil, err
}
} else {
mergedTree = prefixedTree
}
currentTree = mergedTree
}
return currentTree, nil
}
func (s *state) mergeTrees(t1, t2 *git.Tree) (*git.Tree, error) {
index, err := s.repo.MergeTrees(nil, t1, t2, nil)
if err != nil {
return nil, err
}
defer index.Free()
if index.HasConflicts() {
return nil, fmt.Errorf("Cannot split as there is a merge conflict between two paths")
}
oid, err := index.WriteTreeTo(s.repo)
if err != nil {
return nil, err
}
return s.repo.LookupTree(oid)
}
func (s *state) addPrefixToTree(tree *git.Tree, prefix string) (*git.Tree, error) {
treeOid := tree.Id()
parts := strings.Split(prefix, "/")
for i := len(parts) - 1; i >= 0; i-- {
treeBuilder, err := s.repo.TreeBuilder()
if err != nil {
return nil, err
}
defer treeBuilder.Free()
err = treeBuilder.Insert(parts[i], treeOid, git.FilemodeTree)
if err != nil {
return nil, err
}
treeOid, err = treeBuilder.Write()
if err != nil {
return nil, err
}
}
prefixedTree, err := s.repo.LookupTree(treeOid)
if err != nil {
return nil, err
}
return prefixedTree, nil
}
func (s *state) copyOrSkip(rev *git.Commit, tree *git.Tree, newParents []*git.Oid) (*git.Oid, bool, error) {
var identical, nonIdentical *git.Oid
var gotParents []*git.Oid
var p []*git.Commit
for _, parent := range newParents {
ptree, err := s.topTreeForCommit(parent)
if err != nil {
return nil, false, err
}
if nil == ptree {
continue
}
if 0 == ptree.Cmp(tree.Id()) {
// an identical parent could be used in place of this rev.
identical = parent
} else {
nonIdentical = parent
}
// sometimes both old parents map to the same newparent
// eliminate duplicates
isNew := true
for _, gp := range gotParents {
if 0 == gp.Cmp(parent) {
isNew = false
break
}
}
if isNew {
gotParents = append(gotParents, parent)
commit, err := s.repo.LookupCommit(parent)
if err != nil {
return nil, false, err
}
defer commit.Free()
p = append(p, commit)
}
}
copyCommit := false
if s.config.Git > 2 && nil != identical && nil != nonIdentical {
revWalk, err := s.repo.Walk()
if err != nil {
return nil, false, fmt.Errorf("Impossible to walk the repository: %s", err)
}
s.repoMu.Lock()
defer s.repoMu.Unlock()
err = revWalk.PushRange(fmt.Sprintf("%s..%s", identical, nonIdentical))
if err != nil {
return nil, false, fmt.Errorf("Impossible to determine split range: %s", err)
}
err = revWalk.Iterate(func(rev *git.Commit) bool {
// we need to preserve history along the other branch
copyCommit = true
return false
})
if err != nil {
return nil, false, err
}
revWalk.Free()
}
if nil != identical && !copyCommit {
return identical, false, nil
}
commit, err := s.copyCommit(rev, tree, p)
if err != nil {
return nil, false, err
}
return commit, true, nil
}
func (s *state) topTreeForCommit(sha *git.Oid) (*git.Oid, error) {
commit, err := s.repo.LookupCommit(sha)
if err != nil {
return nil, err
}
defer commit.Free()
tree, err := commit.Tree()
if err != nil {
return nil, err
}
defer tree.Free()
return tree.Id(), nil
}
func (s *state) copyCommit(rev *git.Commit, tree *git.Tree, parents []*git.Commit) (*git.Oid, error) {
if s.config.Debug {
parentStrs := make([]string, len(parents))
for i, parent := range parents {
parentStrs[i] = parent.Id().String()
}
s.logger.Printf(" copy commit \"%s\" \"%s\" \"%s\"\n", rev.Id().String(), tree.Id().String(), strings.Join(parentStrs, " "))
}
message := rev.RawMessage()
if s.config.Git == 1 {
message = s.legacyMessage(rev)
}
author := rev.Author()
if author.Email == "" {
author.Email = "nobody@example.com"
}
oid, err := s.repo.CreateCommit("", author, rev.Committer(), message, tree, parents...)
if err != nil {
return nil, err
}
return oid, nil
}
func (s *state) updateTarget() error {
if s.config.Target == "" {
return nil
}
if nil == s.result.Head() {
return fmt.Errorf("Unable to create branch %s as it is empty (no commits were split)", s.config.Target)
}
obj, ref, err := s.repo.RevparseExt(s.config.Target)
if obj != nil {
obj.Free()
}
if err != nil {
ref, err = s.repo.References.Create(s.config.Target, s.result.Head(), false, "subtree split")
if err != nil {
return err
}
ref.Free()
} else {
defer ref.Free()
ref.SetTarget(s.result.Head(), "subtree split")
}
return nil
}
func (s *state) legacyMessage(rev *git.Commit) string {
subject, body := SplitMessage(rev.Message())
return subject + "\n\n" + body
}
// pushRevs sets the range to split
func (s *state) pushRevs(revWalk *git.RevWalk) error {
// this is needed as origin might be in the process of being updated by git.FetchOrigin()
s.repoMu.Lock()
defer s.repoMu.Unlock()
// find the latest split sha1 if any on origin
var start *git.Oid
var err error
if s.config.Commit != "" {
start, err = git.NewOid(s.config.Commit)
if err != nil {
return err
}
s.result.moveHead(s.cache.get(start))
return revWalk.PushRange(fmt.Sprintf("%s^..%s", start, s.originBranch))
}
start = s.cache.getHead()
if start != nil {
s.result.moveHead(s.cache.get(start))
// FIXME: CHECK that this is an ancestor of the branch?
return revWalk.PushRange(fmt.Sprintf("%s..%s", start, s.originBranch))
}
branch, err := s.repo.RevparseSingle(s.originBranch)
if err != nil {
return err
}
return revWalk.Push(branch.Id())
}