MCDiffyVersion.st
author Jan Vrany <jan.vrany@labware.com>
Tue, 11 Jul 2023 12:59:07 +0100
branchjv
changeset 1174 f0a16c301971
parent 1120 e0ec9591b6e8
permissions -rw-r--r--
Make `ProjectDefinition >> #monticelloTimestamps_code` an extension in `stx:goodies/monticello` ...and convert it to use (not so) new annotation-based extension mechanism.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1120
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
     1
"
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
     2
COPYRIGHT (c) 2020 LabWare
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
     3
"
86
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     4
"{ Package: 'stx:goodies/monticello' }"
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     5
1120
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
     6
"{ NameSpace: Smalltalk }"
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
     7
86
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     8
MCVersion subclass:#MCDiffyVersion
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     9
	instanceVariableNames:'base patch'
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    10
	classVariableNames:''
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    11
	poolDictionaries:''
622
bce0dd518d78 category change
Claus Gittinger <cg@exept.de>
parents: 86
diff changeset
    12
	category:'SCM-Monticello-Versioning'
86
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    13
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    14
1120
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
    15
!MCDiffyVersion class methodsFor:'documentation'!
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
    16
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
    17
copyright
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
    18
"
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
    19
COPYRIGHT (c) 2020 LabWare
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
    20
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
    21
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
    22
"
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
    23
! !
86
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    24
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
!MCDiffyVersion class methodsFor:'instance creation'!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    27
package: aPackage info: aVersionInfo dependencies: aCollection baseInfo: baseVersionInfo patch:
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    28
aPatch
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    29
	^ self basicNew initializeWithPackage: aPackage info: aVersionInfo dependencies: aCollection baseInfo: baseVersionInfo patch:
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    30
aPatch
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    31
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    32
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    33
package: aPackage info: aVersionInfo snapshot: aSnapshot dependencies: aCollection baseVersion: aVersion
890
30748ea1b6e9 wether -> whether (lookup what wether is ;-)
Claus Gittinger <cg@exept.de>
parents: 622
diff changeset
    34
	^ self
86
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    35
		package: aPackage
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    36
		info: aVersionInfo
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    37
		dependencies: aCollection
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    38
		baseInfo: aVersion info
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    39
		patch: (aSnapshot patchRelativeToBase: aVersion snapshot)
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    40
! !
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    41
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    42
!MCDiffyVersion class methodsFor:'name utilities'!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    43
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    44
baseNameFrom: diffName
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    45
	| baseId verName |
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    46
	baseId := (diffName copyAfter: $() copyUpTo: $).
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    47
	baseId ifEmpty: [^baseId].
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    48
	(baseId beginsWith: '@')
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    49
		ifTrue: [^baseId copyAfter: $@].
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    50
	verName := self verNameFrom: diffName.
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    51
	^(baseId includes: $.)
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    52
		ifTrue: [(verName copyUpToLast: $-), '-', baseId]
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    53
		ifFalse: [(verName copyUpToLast: $.), '.', baseId]
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    54
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    55
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    56
canonicalNameFor: aFileName
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    57
	^(self nameForVer: (self verNameFrom: aFileName)
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    58
		base: (self baseNameFrom: aFileName))
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    59
			, '.', MCMcdReader extension
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    60
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    61
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    62
nameForVer: versionName base: baseName
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    63
	| baseId |
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    64
	baseId := (versionName copyUpToLast: $.) = (baseName copyUpToLast: $.)
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    65
		ifTrue: [baseName copyAfterLast: $.]
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    66
		ifFalse: [(versionName copyUpToLast: $-) = (baseName copyUpToLast: $-)
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    67
			ifTrue: [baseName copyAfterLast: $-]
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    68
			ifFalse: ['@', baseName]].
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    69
	^ versionName, '(', baseId, ')'
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    70
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    71
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    72
verNameFrom: diffName
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    73
	^diffName copyUpTo: $(
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
! !
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    75
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    76
!MCDiffyVersion methodsFor:'as yet unclassified'!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    77
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    78
baseInfo
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    79
	^ base
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    80
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    81
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    82
baseSnapshot
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    83
	^ (self workingCopy repositoryGroup versionWithInfo: base) snapshot
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    84
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    85
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    86
canOptimizeLoading
890
30748ea1b6e9 wether -> whether (lookup what wether is ;-)
Claus Gittinger <cg@exept.de>
parents: 622
diff changeset
    87
	"Answer whether I can provide a patch for the working copy without the usual diff pass"
86
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    88
	^ package hasWorkingCopy
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    89
		and: [package workingCopy modified not
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    90
			and: [package workingCopy ancestors includes: self baseInfo]]
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    91
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    93
fileName
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    94
	^ (self class nameForVer: info name base: base name), '.', self writerClass extension
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    95
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    96
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    97
initializeWithPackage: aPackage info: aVersionInfo dependencies: aCollection baseInfo: baseVersionInfo patch: aPatch
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    98
	patch _ aPatch.
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    99
	base _ baseVersionInfo.
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   100
	super initializeWithPackage: aPackage info: aVersionInfo snapshot: nil dependencies: aCollection.
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   101
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   102
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   103
isDiffy
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   104
	^ true
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   105
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   106
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   107
patch
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   108
	^ patch
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   109
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   110
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   111
snapshot
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   112
	^ snapshot ifNil: [snapshot _ MCPatcher apply: patch to: self baseSnapshot]
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   113
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   114
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   115
summary
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   116
	^ '(Diff against ', self baseInfo name, ')', String cr, super summary
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   117
!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   118
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   119
writerClass
890
30748ea1b6e9 wether -> whether (lookup what wether is ;-)
Claus Gittinger <cg@exept.de>
parents: 622
diff changeset
   120
	^ MCMcdWriter
86
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   121
! !
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   122
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   123
!MCDiffyVersion class methodsFor:'documentation'!
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   124
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   125
version
890
30748ea1b6e9 wether -> whether (lookup what wether is ;-)
Claus Gittinger <cg@exept.de>
parents: 622
diff changeset
   126
    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCDiffyVersion.st,v 1.3 2013-07-27 13:50:33 cg Exp $'
1120
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
   127
!
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
   128
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
   129
version_HG
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
   130
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
   131
    ^ '$Changeset: <not expanded> $'
86
eed3e22cac66 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   132
! !
1120
e0ec9591b6e8 Tonel: various fixes here and there (part 1)
Jan Vrany <jan.vrany@labware.com>
parents: 890
diff changeset
   133