81
|
1 |
"{ Package: 'stx:goodies/monticello' }"
|
|
2 |
|
|
3 |
Object subclass:#MCVersionMerger
|
|
4 |
instanceVariableNames:'records merger'
|
|
5 |
classVariableNames:''
|
|
6 |
poolDictionaries:''
|
704
|
7 |
category:'SCM-Monticello-Versioning'
|
81
|
8 |
!
|
|
9 |
|
|
10 |
|
|
11 |
!MCVersionMerger class methodsFor:'as yet unclassified'!
|
|
12 |
|
|
13 |
mergeVersion: aVersion
|
|
14 |
self new
|
|
15 |
addVersion: aVersion;
|
|
16 |
mergeWithNameLike: aVersion info name
|
|
17 |
!
|
|
18 |
|
|
19 |
new
|
|
20 |
^ self basicNew initialize
|
|
21 |
! !
|
|
22 |
|
|
23 |
!MCVersionMerger methodsFor:'as yet unclassified'!
|
|
24 |
|
|
25 |
addVersion: aVersion
|
|
26 |
| dep |
|
|
27 |
records add: (MCMergeRecord version: aVersion).
|
|
28 |
aVersion dependencies do:
|
|
29 |
[:ea |
|
|
30 |
dep _ ea resolve.
|
|
31 |
(records anySatisfy: [:r | r version = dep]) ifFalse: [self addVersion: dep]]
|
|
32 |
!
|
|
33 |
|
|
34 |
initialize
|
|
35 |
records _ OrderedCollection new.
|
|
36 |
merger _ MCThreeWayMerger new.
|
|
37 |
!
|
|
38 |
|
|
39 |
merge
|
|
40 |
records do: [:ea | merger addBaseSnapshot: ea packageSnapshot].
|
|
41 |
records do: [:ea | merger applyPatch: ea mergePatch].
|
|
42 |
self resolveConflicts ifTrue:
|
|
43 |
[merger load.
|
|
44 |
records do: [:ea | ea updateWorkingCopy]].
|
|
45 |
!
|
|
46 |
|
|
47 |
mergeWithNameLike: baseName
|
|
48 |
records do: [:ea | merger addBaseSnapshot: ea packageSnapshot].
|
|
49 |
records do: [:ea | merger applyPatch: ea mergePatch].
|
|
50 |
self resolveConflicts ifTrue:
|
|
51 |
[merger loadWithNameLike: baseName.
|
|
52 |
records do: [:ea | ea updateWorkingCopy]].
|
|
53 |
!
|
|
54 |
|
|
55 |
resolveConflicts
|
|
56 |
(records allSatisfy: [:ea | ea isAncestorMerge]) ifTrue: [MCNoChangesException signal. ^ false].
|
|
57 |
^ ((MCMergeResolutionRequest new merger: merger)
|
|
58 |
signal: 'Merging ', records first version info name) = true
|
|
59 |
! !
|
|
60 |
|
|
61 |
!MCVersionMerger class methodsFor:'documentation'!
|
|
62 |
|
|
63 |
version
|
704
|
64 |
^ '$Header: /cvs/stx/stx/goodies/monticello/MCVersionMerger.st,v 1.2 2012-09-11 21:30:49 cg Exp $'
|
81
|
65 |
! !
|