| author | Claus Gittinger <cg@exept.de> |
| Tue, 01 Oct 2019 08:49:33 +0200 | |
| changeset 4505 | 525d1fd161ed |
| parent 4490 | b81572bab216 |
| child 4513 | 927fa8db128e |
| permissions | -rw-r--r-- |
| 4490 | 1 |
"{ Encoding: utf8 }"
|
2 |
||
| 906 | 3 |
" |
4 |
COPYRIGHT (c) 2000 eXept Software AG |
|
5 |
All Rights Reserved |
|
6 |
||
7 |
This software is furnished under a license and may be used |
|
8 |
only in accordance with the terms of that license and with the |
|
9 |
inclusion of the above copyright notice. This software may not |
|
10 |
be provided or otherwise made available to, or used by, any |
|
11 |
other person. No title to or ownership of the software is |
|
12 |
hereby transferred. |
|
13 |
" |
|
| 920 | 14 |
"{ Package: 'stx:libbasic3' }"
|
15 |
||
|
3812
173678af0074
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3692
diff
changeset
|
16 |
"{ NameSpace: Smalltalk }"
|
|
173678af0074
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3692
diff
changeset
|
17 |
|
| 873 | 18 |
Object subclass:#SourceCodeManagerUtilities |
| 2847 | 19 |
instanceVariableNames:'manager resources confirmNewFiles' |
20 |
classVariableNames:'LastSourceLogMessage LastModule LastPackage YesToAllQuery |
|
| 4174 | 21 |
YesToAllNotification LastSourceLogMessages DefaultUtilities |
| 4448 | 22 |
LastTag LastComparedTag AlwaysUpdateVersionMethodsIfNoOtherChange |
23 |
DoNotAskForCondenseIfSameAsRepository' |
|
| 2847 | 24 |
poolDictionaries:'' |
25 |
category:'System-SourceCodeManagement' |
|
| 873 | 26 |
! |
27 |
||
28 |
!SourceCodeManagerUtilities class methodsFor:'documentation'! |
|
29 |
||
| 906 | 30 |
copyright |
31 |
" |
|
32 |
COPYRIGHT (c) 2000 eXept Software AG |
|
33 |
All Rights Reserved |
|
34 |
||
35 |
This software is furnished under a license and may be used |
|
36 |
only in accordance with the terms of that license and with the |
|
37 |
inclusion of the above copyright notice. This software may not |
|
38 |
be provided or otherwise made available to, or used by, any |
|
39 |
other person. No title to or ownership of the software is |
|
40 |
hereby transferred. |
|
41 |
" |
|
42 |
||
43 |
! |
|
44 |
||
| 873 | 45 |
documentation |
46 |
" |
|
47 |
utility code which is useful at more than one place |
|
48 |
(extracted from the browser) |
|
49 |
||
50 |
[author:] |
|
51 |
Claus Gittinger (cg@exept) |
|
52 |
||
53 |
[see also:] |
|
54 |
||
55 |
[instance variables:] |
|
56 |
||
57 |
[class variables:] |
|
58 |
" |
|
59 |
! ! |
|
60 |
||
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
61 |
!SourceCodeManagerUtilities class methodsFor:'instance creation'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
62 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
63 |
forManager: aSourceCodeManager |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
64 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
65 |
^self new setManager: aSourceCodeManager |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
66 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
67 |
"Created: / 10-10-2011 / 11:45:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2597
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
68 |
! |
|
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
69 |
|
|
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
70 |
new |
|
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
71 |
"return an initialized instance" |
|
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
72 |
|
| 2969 | 73 |
self == SourceCodeManagerUtilities ifTrue:[ |
74 |
self abstractClassInstantiationError |
|
75 |
]. |
|
|
2597
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
76 |
^ self basicNew initialize. |
| 2847 | 77 |
|
78 |
"Modified: / 25-07-2012 / 17:10:55 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
79 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
80 |
|
| 992 | 81 |
!SourceCodeManagerUtilities class methodsFor:'Signal constants'! |
82 |
||
83 |
yesToAllNotification |
|
84 |
YesToAllNotification isNil ifTrue:[ |
|
85 |
YesToAllNotification := QuerySignal new. |
|
86 |
]. |
|
87 |
^ YesToAllNotification |
|
88 |
! |
|
89 |
||
90 |
yesToAllQuery |
|
91 |
YesToAllQuery isNil ifTrue:[ |
|
92 |
YesToAllQuery := QuerySignal new. |
|
93 |
]. |
|
94 |
^ YesToAllQuery |
|
95 |
! ! |
|
96 |
||
| 1084 | 97 |
!SourceCodeManagerUtilities class methodsFor:'accessing'! |
98 |
||
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
99 |
default |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
100 |
|
|
3635
765b567f596a
oops - a global variable named "Default" was introduced
Claus Gittinger <cg@exept.de>
parents:
3633
diff
changeset
|
101 |
DefaultUtilities isNil ifTrue:[DefaultUtilities := SourceCodeManagerUtilitiesForContainerBasedManagers new]. |
|
3642
28683778b9c3
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3635
diff
changeset
|
102 |
^ DefaultUtilities |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
103 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
104 |
"Created: / 10-10-2011 / 11:28:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 2864 | 105 |
"Modified: / 26-07-2012 / 20:31:52 / cg" |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
106 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
107 |
|
| 1084 | 108 |
lastModule |
109 |
"return the value of the static variable 'LastModule' (automatically generated)" |
|
110 |
||
111 |
^ LastModule |
|
112 |
! |
|
113 |
||
114 |
lastModule:something |
|
115 |
"set the value of the static variable 'LastModule' (automatically generated)" |
|
116 |
||
117 |
LastModule := something. |
|
118 |
! |
|
119 |
||
120 |
lastPackage |
|
121 |
"return the value of the static variable 'LastPackage' (automatically generated)" |
|
122 |
||
123 |
^ LastPackage |
|
124 |
! |
|
125 |
||
126 |
lastPackage:something |
|
127 |
"set the value of the static variable 'LastPackage' (automatically generated)" |
|
128 |
||
129 |
LastPackage := something. |
|
130 |
! ! |
|
131 |
||
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
132 |
!SourceCodeManagerUtilities class methodsFor:'error handling'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
133 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
134 |
doesNotUnderstand: aMessage |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
135 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
136 |
(self default respondsTo: aMessage selector) ifTrue:[ |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
137 |
"Bad, method moved to instance side but not forwarded" |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
138 |
self breakPoint: #jv. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
139 |
self breakPoint: #cg. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
140 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
141 |
^aMessage sendTo: self default |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
142 |
] ifFalse:[ |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
143 |
^super doesNotUnderstand: aMessage |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
144 |
] |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
145 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
146 |
"Created: / 10-10-2011 / 14:04:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
147 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
148 |
|
| 2569 | 149 |
!SourceCodeManagerUtilities class methodsFor:'private-migration'! |
150 |
||
151 |
compileForwarders |
|
152 |
||
153 |
"Utility method" |
|
154 |
||
155 |
" |
|
156 |
SourceCodeManagerUtilities compileForwarders. |
|
157 |
" |
|
158 |
||
159 |
self methodsDo:[:m| |
|
160 |
| sel | |
|
161 |
sel := m selector. |
|
162 |
((self class includesSelector: sel) and: [(self class >> sel) source = m source]) ifTrue:[ |
|
163 |
| source header | |
|
164 |
||
165 |
header := m source asStringCollection first. |
|
166 |
source := '%1 |
|
167 |
||
168 |
<resource: #obsolete> |
|
169 |
||
170 |
self obsoleteMethodWarning: ''Please use instance protocol (SourceCodeManagerUtilities default doSomething)''. |
|
171 |
||
172 |
^self default %1' bindWith: header with: header. |
|
173 |
||
174 |
self halt: 'Inspect source'. |
|
175 |
self class compile: source classified: m category. |
|
176 |
]. |
|
177 |
||
178 |
] |
|
179 |
||
180 |
"Created: / 11-10-2011 / 10:55:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
181 |
! ! |
|
182 |
||
| 1806 | 183 |
!SourceCodeManagerUtilities class methodsFor:'resources'! |
184 |
||
185 |
resourcePackage |
|
186 |
^ #'stx:libtool' |
|
187 |
! ! |
|
188 |
||
| 873 | 189 |
!SourceCodeManagerUtilities class methodsFor:'utilities'! |
190 |
||
|
1882
8b3a4c2a2c2a
when creating a new container, set the package of all methods.
Claus Gittinger <cg@exept.de>
parents:
1879
diff
changeset
|
191 |
classIsNotYetInRepository:aClass withManager:mgr |
| 2570 | 192 |
|
193 |
<resource: #obsolete> |
|
194 |
||
195 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
196 |
||
197 |
^self default classIsNotYetInRepository:aClass withManager:mgr |
|
|
1882
8b3a4c2a2c2a
when creating a new container, set the package of all methods.
Claus Gittinger <cg@exept.de>
parents:
1879
diff
changeset
|
198 |
! |
|
8b3a4c2a2c2a
when creating a new container, set the package of all methods.
Claus Gittinger <cg@exept.de>
parents:
1879
diff
changeset
|
199 |
|
| 1704 | 200 |
nameOfExtensionsContainer |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
201 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
202 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
203 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
204 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
205 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
206 |
^self default nameOfExtensionsContainer |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
207 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
208 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
209 |
setPackageOfAllMethodsIn:aClass to:aPackage |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
210 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
211 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
212 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
213 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
214 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
215 |
^self default setPackageOfAllMethodsIn:aClass to:aPackage |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
216 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
217 |
"Modified: / 10-10-2011 / 14:00:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
218 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
219 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
220 |
setPackageOfAllMethodsInChangeSet:aChangeSet to:aPackage |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
221 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
222 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
223 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
224 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
225 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
226 |
^self default setPackageOfAllMethodsInChangeSet:aChangeSet to:aPackage |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
227 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
228 |
"Created: / 10-10-2011 / 14:00:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
229 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
230 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
231 |
sourceCodeManagerFor:aClass |
|
3370
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
232 |
|mgr assumption| |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
233 |
|
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
234 |
mgr := aClass theNonMetaclass sourceCodeManager. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
235 |
mgr isNil ifTrue:[ |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
236 |
SourceCodeManager isNil ifTrue:[ |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
237 |
"/ self warn:'SourceCodeManagement is disabled or not configured.\\Please setup in the Launcher.' withCRs. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
238 |
^ nil. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
239 |
]. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
240 |
assumption := AbstractSourceCodeManager defaultManager ? CVSSourceCodeManager. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
241 |
assumption notNil ifTrue:[ |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
242 |
(self confirm:('Class does not seem to provide a valid sourceCodeManager.\\Assume %1 ?' bindWith:assumption managerTypeName) withCRs) ifFalse:[
|
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
243 |
^ nil |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
244 |
]. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
245 |
mgr := assumption. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
246 |
]. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
247 |
]. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
248 |
^ mgr |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
249 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
250 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
251 |
sourceCodeOfClass:aClass |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
252 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
253 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
254 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
255 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
256 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
257 |
^self default sourceCodeOfClass:aClass |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
258 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
259 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
260 |
versionString:a isLessThan:b |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
261 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
262 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
263 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
264 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
265 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
266 |
^self default versionString:a isLessThan:b |
| 4436 | 267 |
|
268 |
" |
|
269 |
SourceCodeManagerUtilities default versionString:'1.10.2' isLessThan:'1.100.1' |
|
270 |
" |
|
271 |
||
272 |
"Modified (comment): / 28-05-2019 / 15:47:35 / Claus Gittinger" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
273 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
274 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
275 |
!SourceCodeManagerUtilities class methodsFor:'utilities-cvs'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
276 |
|
| 2691 | 277 |
changeSetForExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision usingManager:aSourceCodeManager |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
278 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
279 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
280 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
281 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
282 |
|
| 2691 | 283 |
^self default changeSetForExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision usingManager:aSourceCodeManager |
284 |
||
285 |
"Created: / 29-12-2011 / 14:28:08 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
286 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
287 |
|
| 2691 | 288 |
changeSetForExtensionMethodsForPackage:packageToCheckOut revision:revisionOrNil orAskForRevision:askForRevision usingManager:aSourceCodeManager |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
289 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
290 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
291 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
292 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
293 |
|
| 2691 | 294 |
^self default |
295 |
changeSetForExtensionMethodsForPackage:packageToCheckOut |
|
296 |
revision:revisionOrNil |
|
297 |
orAskForRevision:askForRevision |
|
298 |
usingManager:aSourceCodeManager |
|
299 |
||
300 |
"Created: / 29-12-2011 / 14:28:14 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
301 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
302 |
|
| 2691 | 303 |
checkForExistingModule:module directory:directory container:containerFileName usingManager:mgr allowCreate:allowCreate |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
304 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
305 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
306 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
307 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
308 |
|
| 2691 | 309 |
^self default checkForExistingModule:module directory:directory container:containerFileName usingManager:mgr allowCreate:allowCreate |
310 |
||
311 |
"Created: / 29-12-2011 / 14:30:37 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
312 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
313 |
|
| 2691 | 314 |
checkForExistingModule:module directory:directory usingManager:mgr allowCreate:allowCreate |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
315 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
316 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
317 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
318 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
319 |
|
| 2691 | 320 |
^self default checkForExistingModule:module directory:directory usingManager:mgr allowCreate:allowCreate |
321 |
||
322 |
"Created: / 29-12-2011 / 14:29:02 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
323 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
324 |
|
| 2691 | 325 |
checkForExistingModule:module usingManager:mgr allowCreate:allowCreate |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
326 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
327 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
328 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
329 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
330 |
|
| 2691 | 331 |
^self default checkForExistingModule:module usingManager:mgr allowCreate:allowCreate |
332 |
||
333 |
"Created: / 29-12-2011 / 14:30:00 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
334 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
335 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
336 |
checkinClass:aClass |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
337 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
338 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
339 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
340 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
341 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
342 |
^self default checkinClass:aClass |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
343 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
344 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
345 |
checkinClass:aClass withInfo:aLogInfoOrNil |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
346 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
347 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
348 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
349 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
350 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
351 |
^self default checkinClass:aClass withInfo:aLogInfoOrNil |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
352 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
353 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
354 |
checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClass |
| 2569 | 355 |
|
356 |
<resource: #obsolete> |
|
357 |
||
358 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
359 |
||
360 |
^self default checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClass |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
361 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
362 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
363 |
checkinClasses:aCollectionOfClass |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
364 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
365 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
366 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
367 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
368 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
369 |
^self default checkinClasses:aCollectionOfClass |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
370 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
371 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
372 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
373 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
374 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
375 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
376 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
377 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
378 |
^self default checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
379 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
380 |
|
| 4276 | 381 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil onBranch:branchNameOrNil |
382 |
||
383 |
<resource: #obsolete> |
|
384 |
||
385 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
386 |
||
387 |
^self default checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil onBranch:branchNameOrNil |
|
388 |
||
389 |
"Created: / 05-12-2017 / 20:15:04 / cg" |
|
390 |
! |
|
391 |
||
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
392 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClasses |
| 2569 | 393 |
|
394 |
<resource: #obsolete> |
|
395 |
||
396 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
397 |
||
398 |
^self default checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClasses |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
399 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
400 |
|
| 4276 | 401 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClasses onBranch:branchNameOrNil |
402 |
||
403 |
<resource: #obsolete> |
|
404 |
||
405 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
406 |
||
407 |
^self default checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClasses onBranch:branchNameOrNil |
|
408 |
||
409 |
"Created: / 05-12-2017 / 20:15:55 / cg" |
|
410 |
! |
|
411 |
||
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
412 |
checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
413 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
414 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
415 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
416 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
417 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
418 |
^self default checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
419 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
420 |
|
| 4276 | 421 |
checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil onBranch:branchNameOrNil |
422 |
||
423 |
<resource: #obsolete> |
|
424 |
||
425 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
426 |
||
427 |
^self default checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil onBranch:branchNameOrNil |
|
428 |
||
429 |
"Created: / 05-12-2017 / 20:13:44 / cg" |
|
430 |
! |
|
431 |
||
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
432 |
checkoutClass:aClass askForMerge:askForMerge |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
433 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
434 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
435 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
436 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
437 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
438 |
^self default checkoutClass:aClass askForMerge:askForMerge |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
439 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
440 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
441 |
checkoutClass:aClass askForRevision:askForRevision askForMerge:askForMerge |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
442 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
443 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
444 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
445 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
446 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
447 |
^self default checkoutClass:aClass askForRevision:askForRevision askForMerge:askForMerge |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
448 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
449 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
450 |
checkoutClass:aClass askForRevision:askForRevision askForMerge:askForMerge askForConfirmation:askForConfirmation |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
451 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
452 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
453 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
454 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
455 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
456 |
^self default checkoutClass:aClass askForRevision:askForRevision askForMerge:askForMerge askForConfirmation:askForConfirmation |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
457 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
458 |
|
| 2691 | 459 |
checkoutExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision askForMerge:askForMerge usingManager:aSourceCodeManager |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
460 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
461 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
462 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
463 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
464 |
|
| 2691 | 465 |
^self default checkoutExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision askForMerge:askForMerge usingManager:aSourceCodeManager |
466 |
||
467 |
"Created: / 29-12-2011 / 14:34:24 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
468 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
469 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
470 |
compareClassWithRepository:aClass |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
471 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
472 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
473 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
474 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
475 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
476 |
^self default compareClassWithRepository:aClass |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
477 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
478 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
479 |
compareClassWithRepository:aClass askForRevision:askForRevision |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
480 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
481 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
482 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
483 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
484 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
485 |
^self default compareClassWithRepository:aClass askForRevision:askForRevision |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
486 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
487 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
488 |
compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
489 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
490 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
491 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
492 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
493 |
|
| 3926 | 494 |
^self compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:false |
495 |
! |
|
496 |
||
497 |
compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:extensionsOnly |
|
498 |
||
499 |
<resource: #obsolete> |
|
500 |
||
501 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
502 |
||
503 |
^self default compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:extensionsOnly |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
504 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
505 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
506 |
compareProjectWithRepository:aProject |
| 2569 | 507 |
|
508 |
<resource: #obsolete> |
|
509 |
||
510 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
511 |
||
512 |
^self default compareProjectWithRepository:aProject |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
513 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
514 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
515 |
createSourceContainerForClass:aClass |
| 2569 | 516 |
|
517 |
<resource: #obsolete> |
|
518 |
||
519 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
520 |
||
521 |
^self default createSourceContainerForClass:aClass |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
522 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
523 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
524 |
defineSourceContainerForClass:aClass title:title text:boxText createDirectories:createDirs createContainer:createContainer |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
525 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
526 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
527 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
528 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
529 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
530 |
^self default defineSourceContainerForClass:aClass title:title text:boxText createDirectories:createDirs createContainer:createContainer |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
531 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
532 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
533 |
diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
534 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
535 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
536 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
537 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
538 |
|
| 3926 | 539 |
^self diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:false |
540 |
! |
|
541 |
||
542 |
diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:extensionsOnly |
|
543 |
||
544 |
<resource: #obsolete> |
|
545 |
||
546 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
547 |
||
548 |
^self default |
|
549 |
diffSetOfProject:aProject |
|
550 |
againstRepositoryVersionFrom:aDateOrNilForNewest |
|
551 |
extensionsOnly:extensionsOnly |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
552 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
553 |
|
| 2691 | 554 |
ensureCorrectVersionMethodsInClass:aClass usingManager:aManager |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
555 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
556 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
557 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
558 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
559 |
|
| 2691 | 560 |
^self default ensureCorrectVersionMethodsInClass:aClass usingManager:aManager |
561 |
||
562 |
"Created: / 29-12-2011 / 14:33:37 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
563 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
564 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
565 |
getLogMessageForClassCheckinTakingDefaultsFromPreviousLogInfo:aLogInfoOrNil forClass:aClass valuesInto:aBlock |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
566 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
567 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
568 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
569 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
570 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
571 |
^self default getLogMessageForClassCheckinTakingDefaultsFromPreviousLogInfo:aLogInfoOrNil forClass:aClass valuesInto:aBlock |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
572 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
573 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
574 |
removeSourceContainerForClass:aClass |
| 2569 | 575 |
|
576 |
<resource: #obsolete> |
|
577 |
||
578 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
579 |
||
580 |
^self default removeSourceContainerForClass:aClass |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
581 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
582 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
583 |
removeSourceContainerForClass:aClass confirm:doConfirm warn:doWarn |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
584 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
585 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
586 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
587 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
588 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
589 |
^self default removeSourceContainerForClass:aClass confirm:doConfirm warn:doWarn |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
590 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
591 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
592 |
repositoryLogOf:aClass onto:aStream |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
593 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
594 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
595 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
596 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
597 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
598 |
^self default repositoryLogOf:aClass onto:aStream |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
599 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
600 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
601 |
repositoryLogOf:aClass short:shortOrNot onto:aStream |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
602 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
603 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
604 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
605 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
606 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
607 |
^self default repositoryLogOf:aClass short:shortOrNot onto:aStream |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
608 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
609 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
610 |
tagClass:aClass as:tag |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
611 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
612 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
613 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
614 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
615 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
616 |
^self default tagClass:aClass as:tag |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
617 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
618 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
619 |
tagClasses:aCollectionOfClasses as:tag |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
620 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
621 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
622 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
623 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
624 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
625 |
^self default tagClasses:aCollectionOfClasses as:tag |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
626 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
627 |
|
| 2691 | 628 |
tagPath:aPath as:tag usingManager:aManager |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
629 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
630 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
631 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
632 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
633 |
|
| 2691 | 634 |
^self default tagPath:aPath as:tag usingManager:aManager |
635 |
||
636 |
"Created: / 29-12-2011 / 14:31:43 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
637 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
638 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
639 |
!SourceCodeManagerUtilities class methodsFor:'utilities-cvs-helpers'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
640 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
641 |
getMethodVersionsOfClass:aClass selector:selector numberOfRevisions:numberOfRevisionsOrNil |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
642 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
643 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
644 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
645 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
646 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
647 |
^self default getMethodVersionsOfClass:aClass selector:selector numberOfRevisions:numberOfRevisionsOrNil |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
648 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
649 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
650 |
!SourceCodeManagerUtilities class methodsFor:'utilities-cvs-user interaction'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
651 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
652 |
askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
653 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
654 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
655 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
656 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
657 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
658 |
^self default askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
659 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
660 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
661 |
askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName forNewContainer:forNewContainer |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
662 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
663 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
664 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
665 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
666 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
667 |
^self default askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName forNewContainer:forNewContainer |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
668 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
669 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
670 |
askForExistingRevision:boxText title:title class:aClass |
| 2570 | 671 |
|
672 |
<resource: #obsolete> |
|
673 |
||
674 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
675 |
||
676 |
^self default askForExistingRevision:boxText title:title class:aClass |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
677 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
678 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
679 |
askForExistingRevision:boxText title:title class:clsOrNil manager:aSourceCodeManager module:module package:directory fileName:fileName |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
680 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
681 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
682 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
683 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
684 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
685 |
^self default askForExistingRevision:boxText title:title class:clsOrNil manager:aSourceCodeManager module:module package:directory fileName:fileName |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
686 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
687 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
688 |
checkAndWarnAboutBadMessagesInClass:aClass checkAgainHolder:checkAgainHolder |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
689 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
690 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
691 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
692 |
self obsoleteMethodWarning: 'Please use instance protocol (SourceCodeManagerUtilities default doSomething)'. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
693 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
694 |
^self default checkAndWarnAboutBadMessagesInClass:aClass checkAgainHolder:checkAgainHolder |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
695 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
696 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
697 |
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswerOrNil |
| 2795 | 698 |
^self default |
699 |
getCheckinInfoFor:aClassNameOrPackageNameString |
|
700 |
initialAnswer:initialAnswerOrNil |
|
701 |
||
702 |
"Modified: / 12-03-2012 / 12:56:45 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
703 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
704 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
705 |
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswerOrNil withQuickOption:withQuickOption |
| 2795 | 706 |
^self default |
707 |
getCheckinInfoFor:aClassNameOrPackageNameString |
|
708 |
initialAnswer:initialAnswerOrNil |
|
709 |
withQuickOption:withQuickOption |
|
710 |
||
711 |
"Modified: / 12-03-2012 / 12:56:50 / cg" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
712 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
713 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
714 |
goodInitialLogMessageForCheckinClassOfClass:aClass |
| 4230 | 715 |
"figure out, if there were any non-comment changes. |
716 |
Provide a reasonable initial log message (I am tired of typing in 'comment only'). |
|
717 |
This is a q&d hack - not complete and not correct (for example, it will generate a method change |
|
718 |
info line, even if the selector was removed afterwards). |
|
719 |
So check the outcome." |
|
720 |
||
| 4301 | 721 |
|printSelectors initialLogStream additionalInfoPerChangedSelector changesForThisCheckin changesPerClass| |
| 4230 | 722 |
|
723 |
"/ a helper function |
|
724 |
printSelectors := |
|
725 |
[:what :selectors :more | |
|
726 |
|sel moreInfo| |
|
727 |
||
728 |
selectors remove:nil ifAbsent:[]. |
|
729 |
initialLogStream nextPutAll:(what,':'). |
|
730 |
selectors size < 15 ifTrue:[ |
|
731 |
selectors size == 1 ifTrue:[ |
|
732 |
sel := selectors first. |
|
733 |
initialLogStream nextPutAll: ' #'; nextPutAll:sel. |
|
734 |
more ifTrue:[ |
|
735 |
(moreInfo := additionalInfoPerChangedSelector at:sel ifAbsent:nil) notNil ifTrue:[ |
|
736 |
initialLogStream space; nextPutAll:moreInfo. |
|
737 |
] |
|
738 |
]. |
|
739 |
initialLogStream cr. |
|
740 |
] ifFalse:[ |
|
741 |
initialLogStream cr. |
|
742 |
selectors asSortedCollection do:[:sel | |
|
743 |
initialLogStream tab; nextPutAll:'#'; nextPutAll:sel. |
|
744 |
more ifTrue:[ |
|
745 |
(moreInfo := additionalInfoPerChangedSelector at:sel ifAbsent:nil) notNil ifTrue:[ |
|
746 |
initialLogStream space; nextPutAll:moreInfo. |
|
747 |
]. |
|
748 |
]. |
|
749 |
initialLogStream cr |
|
750 |
]. |
|
751 |
]. |
|
752 |
] ifFalse:[ |
|
753 |
initialLogStream |
|
754 |
print: (selectors size); nextPutAll: ' methods'; cr. |
|
755 |
]. |
|
756 |
]. |
|
757 |
||
758 |
changesForThisCheckin := ChangeSet current |
|
759 |
select:[:aChange | |
|
760 |
|changeClass| |
|
761 |
||
| 4241 | 762 |
aChange isClassChange |
763 |
and:[ aChange changeClass notNil |
|
764 |
and:[ |
|
| 4230 | 765 |
changeClass := aChange changeClass theNonMetaclass. |
766 |
changeClass == aClass or:[changeClass topOwningClass == aClass] |
|
| 4241 | 767 |
]]. |
| 4230 | 768 |
]. |
769 |
||
770 |
changesForThisCheckin sort:[:a :b| a className < b className]. |
|
771 |
changesPerClass := changesForThisCheckin asCollectionOfSubCollectionsSeparatedByAnyChange:[:prev :curr| prev className ~= curr className]. |
|
772 |
||
773 |
initialLogStream := '' writeStream. |
|
774 |
||
775 |
changesPerClass do:[:changesForThisClass| |
|
776 |
|selectorsInChangeSet newSelectors modifiedSelectors definitionChangesForThisClass methodChangesForThisClass |
|
777 |
allMethodChangesForThisClass modifiedMethodsForThisClass newMethodsForThisClass removedMethodsForThisClass |
|
778 |
selectorsWithCommentOrFormattingChangeOnly |
|
779 |
selectorsWithVariableChangeOnly newSelectorsRemoved |
|
780 |
removedSelectors categoryChanges categoryChangeSelectors| |
|
781 |
||
782 |
additionalInfoPerChangedSelector := Dictionary new. |
|
783 |
definitionChangesForThisClass := changesForThisClass reject:[:aChange | aChange isMethodChange]. |
|
784 |
categoryChanges := changesForThisClass select:[:aChange | aChange isMethodCategoryChange]. |
|
785 |
categoryChangeSelectors := categoryChanges collect:[:aChange | aChange changeSelector] as:Set. |
|
786 |
allMethodChangesForThisClass := changesForThisClass select:[:aChange | aChange isMethodCodeChange]. |
|
787 |
selectorsInChangeSet := allMethodChangesForThisClass collect:[:aChange | aChange changeSelector] as:Set. |
|
788 |
methodChangesForThisClass := selectorsInChangeSet collect:[:eachSelector | |
|
789 |
allMethodChangesForThisClass detectLast:[:change | change changeSelector = eachSelector]] as:OrderedCollection. |
|
790 |
||
791 |
modifiedMethodsForThisClass := methodChangesForThisClass |
|
792 |
select:[:aChange | aChange previousVersion notNil]. |
|
793 |
modifiedSelectors := modifiedMethodsForThisClass collect:[:aChange | aChange changeSelector] as:Set. |
|
794 |
||
795 |
newMethodsForThisClass := allMethodChangesForThisClass |
|
796 |
select:[:aChange | aChange previousVersion isNil]. |
|
797 |
newSelectors := newMethodsForThisClass collect:[:aChange | aChange changeSelector] as:Set. |
|
798 |
||
799 |
removedMethodsForThisClass := changesForThisClass |
|
800 |
select:[:aChange | aChange isMethodRemoveChange and:[ aChange changeMethod isNil ]]. |
|
801 |
removedSelectors := removedMethodsForThisClass collect:[:aChange | aChange changeSelector] as:Set. |
|
802 |
||
803 |
"/ get rid of category changes for new and removed methods |
|
804 |
categoryChanges := categoryChanges reject:[:chg | |
|
805 |
|methodWithChangedCat| |
|
806 |
||
807 |
(methodWithChangedCat := chg changeMethod) isNil |
|
808 |
or:[ newMethodsForThisClass contains:[:newChg | newChg changeMethod = methodWithChangedCat]]]. |
|
809 |
||
810 |
initialLogStream nextPutLine:'class: ', changesForThisClass first className. |
|
811 |
||
812 |
"/ definition? |
|
813 |
"/ suppress definition-message if initial checkin |
|
814 |
(aClass package isNil or:[aClass revision isNil]) ifFalse:[ |
|
815 |
definitionChangesForThisClass notEmpty ifTrue:[ |
|
816 |
"/ self halt. |
|
817 |
initialLogStream nextPutLine:'class definition'. |
|
818 |
]. |
|
819 |
]. |
|
820 |
||
821 |
"/ added selectors? |
|
822 |
newSelectorsRemoved := newSelectors select:[:sel | removedSelectors includes:sel]. |
|
823 |
||
824 |
newSelectors removeAllFoundIn:removedSelectors. |
|
825 |
newSelectors notEmpty ifTrue:[ |
|
826 |
printSelectors value:'added' value:newSelectors value:false. |
|
827 |
]. |
|
828 |
modifiedSelectors removeAllFoundIn:newSelectors. |
|
829 |
categoryChangeSelectors removeAllFoundIn:newSelectors. |
|
830 |
||
831 |
"/ removed selectors? |
|
832 |
removedSelectors removeAllFoundIn:newSelectorsRemoved. |
|
833 |
removedSelectors notEmpty ifTrue:[ |
|
834 |
printSelectors value:'removed' value:removedSelectors value:false. |
|
835 |
]. |
|
836 |
modifiedSelectors removeAllFoundIn:removedSelectors. |
|
837 |
categoryChangeSelectors removeAllFoundIn:removedSelectors. |
|
838 |
||
839 |
"/ modifications? |
|
840 |
modifiedSelectors notEmpty ifTrue:[ |
|
841 |
selectorsWithCommentOrFormattingChangeOnly := Set new. |
|
842 |
selectorsWithVariableChangeOnly := Set new. |
|
843 |
||
844 |
"/ check for format/comment change |
|
845 |
RBParser notNil ifTrue:[ |
|
846 |
modifiedSelectors do:[:eachSelector | |
|
847 |
|oldest newest oldMethod newMethod oldTree newTree |
|
848 |
variableMapping selectorMapping unchangedVariables unchangedSelectors| |
|
849 |
||
850 |
(newSelectors includes:eachSelector) ifFalse:[ |
|
851 |
oldest := allMethodChangesForThisClass detect:[:change | change changeSelector = eachSelector]. |
|
852 |
newest := allMethodChangesForThisClass detectLast:[:change | change changeSelector = eachSelector]. |
|
853 |
||
854 |
oldest := oldest previousVersion notNil ifTrue:[oldest previousVersion] ifFalse:[oldest]. |
|
855 |
||
856 |
oldTree := RBParser parseMethod:oldest source onError:[:aString :pos | nil]. |
|
857 |
newTree := RBParser parseMethod:newest source onError:[:aString :pos | nil]. |
|
858 |
||
859 |
(oldTree notNil and:[newTree notNil]) ifTrue:[ |
|
860 |
variableMapping := Dictionary new. |
|
861 |
(oldTree "semanticallyEqualTo:" equalTo:newTree withMapping: variableMapping) ifTrue:[ |
|
862 |
unchangedVariables := variableMapping keys select:[:k | (variableMapping at:k) = k]. |
|
863 |
variableMapping removeAllKeys:unchangedVariables. |
|
864 |
||
| 4301 | 865 |
(((variableMapping at:'self' ifAbsent:'self') = 'self') |
866 |
and:[ (variableMapping keyAtEqualValue:'self' ifAbsent:'self') = 'self']) ifTrue:[ |
|
| 4230 | 867 |
((variableMapping associations count:[:assoc | assoc key ~= assoc value]) == 0) ifTrue:[ |
868 |
selectorsWithCommentOrFormattingChangeOnly add:eachSelector. |
|
869 |
] ifFalse:[ |
|
870 |
"/ check, if a global has changed (aka sends to another global) |
|
| 4245 | 871 |
((variableMapping keys contains:[:var | var isUppercaseFirst]) |
872 |
or:[ (variableMapping values contains:[:var | var isUppercaseFirst]) ]) ifFalse:[ |
|
| 4230 | 873 |
selectorsWithVariableChangeOnly add:eachSelector. |
874 |
]. |
|
875 |
]. |
|
876 |
]. |
|
877 |
] ifFalse:[ |
|
878 |
selectorMapping := Dictionary new. |
|
879 |
(oldTree equalTo:newTree withSelectorMapping: selectorMapping) ifTrue:[ |
|
880 |
unchangedSelectors := selectorMapping keys select:[:k | (selectorMapping at:k) = k]. |
|
881 |
selectorMapping removeAllKeys:unchangedSelectors. |
|
882 |
(selectorMapping notEmpty and:[selectorMapping size <= 2]) ifTrue:[ |
|
883 |
additionalInfoPerChangedSelector at:eachSelector put:( |
|
884 |
String streamContents:[:s | |
|
885 |
|first| |
|
886 |
||
887 |
s nextPutAll:'('.
|
|
888 |
first := true. |
|
889 |
selectorMapping keysAndValuesDo:[:selOld :selNew | |
|
890 |
first ifFalse:[s nextPutAll:', ']. |
|
891 |
s print:('send #',selNew,' instead of #',selOld).
|
|
892 |
first := false. |
|
893 |
]. |
|
894 |
s nextPutAll:')'. |
|
895 |
]). |
|
896 |
] |
|
897 |
] |
|
898 |
]. |
|
899 |
]. |
|
900 |
] |
|
901 |
]. |
|
902 |
]. |
|
903 |
||
904 |
modifiedSelectors removeAllFoundIn:selectorsWithCommentOrFormattingChangeOnly. |
|
905 |
modifiedSelectors removeAllFoundIn:selectorsWithVariableChangeOnly. |
|
906 |
||
907 |
(selectorsWithCommentOrFormattingChangeOnly notEmpty) ifTrue:[ |
|
908 |
printSelectors value:'comment/format in' value:selectorsWithCommentOrFormattingChangeOnly value:false. |
|
909 |
]. |
|
910 |
(selectorsWithVariableChangeOnly notEmpty) ifTrue:[ |
|
911 |
printSelectors value:'variable renamed in' value:selectorsWithVariableChangeOnly value:false. |
|
912 |
]. |
|
913 |
(modifiedSelectors notEmpty) ifTrue:[ |
|
914 |
printSelectors value:'changed' value:modifiedSelectors value:true. |
|
915 |
]. |
|
916 |
]. |
|
917 |
categoryChanges notEmpty ifTrue:[ |
|
918 |
printSelectors value:'category of' value:categoryChangeSelectors value:false. |
|
919 |
]. |
|
920 |
] separatedBy:[ |
|
921 |
initialLogStream cr. |
|
922 |
]. |
|
923 |
^ initialLogStream contents |
|
924 |
||
925 |
"Modified: / 17-03-2017 / 18:39:28 / stefan" |
|
| 4245 | 926 |
"Modified: / 22-06-2017 / 06:54:44 / cg" |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
927 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
928 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
929 |
!SourceCodeManagerUtilities class methodsFor:'utilities-encoding'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
930 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
931 |
guessEncodingOfFile:aFilename |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
932 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
933 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
934 |
|
| 2818 | 935 |
self obsoleteMethodWarning:'ask CharacterEncoder'. |
936 |
^ CharacterEncoder guessEncodingOfFile:aFilename |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
937 |
! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
938 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
939 |
guessEncodingOfStream:aStream |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
940 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
941 |
<resource: #obsolete> |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
942 |
|
|
2817
8a836ca902d4
changed: #guessEncodingOfStream:
Stefan Vogel <sv@exept.de>
parents:
2796
diff
changeset
|
943 |
self obsoleteMethodWarning:'ask CharacterEncoder'. |
|
8a836ca902d4
changed: #guessEncodingOfStream:
Stefan Vogel <sv@exept.de>
parents:
2796
diff
changeset
|
944 |
^ CharacterEncoder guessEncodingOfStream:aStream |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
945 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
946 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
947 |
!SourceCodeManagerUtilities methodsFor:'accessing'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
948 |
|
| 2847 | 949 |
confirmNewFiles:aBoolean |
950 |
"if true, ask if new files are about to be added to the repo" |
|
951 |
||
952 |
confirmNewFiles := aBoolean. |
|
953 |
||
954 |
"Modified (comment): / 24-07-2012 / 18:18:34 / cg" |
|
955 |
! |
|
956 |
||
| 2795 | 957 |
lastSourceLogMessageHeadlines |
958 |
LastSourceLogMessage isNil ifTrue:[ |
|
959 |
LastSourceLogMessages := OrderedCollection new. |
|
960 |
]. |
|
961 |
^ LastSourceLogMessages |
|
962 |
collect:[:msg | |
|
963 |
msg withoutLeadingSeparators asCollectionOfLines first , '...' |
|
964 |
] |
|
965 |
||
966 |
"Created: / 12-03-2012 / 12:34:35 / cg" |
|
967 |
! |
|
968 |
||
| 2569 | 969 |
yesToAllNotification |
970 |
||
971 |
^self class yesToAllNotification |
|
972 |
||
973 |
"Created: / 11-10-2011 / 12:01:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
974 |
! |
|
975 |
||
976 |
yesToAllQuery |
|
977 |
||
978 |
^self class yesToAllQuery |
|
979 |
||
980 |
"Created: / 11-10-2011 / 12:01:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
981 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
982 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
983 |
!SourceCodeManagerUtilities methodsFor:'error handling'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
984 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
985 |
doesNotUnderstand: aMessage |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
986 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
987 |
(self class respondsTo: aMessage selector) ifTrue:[ |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
988 |
"Bad, method is not moved the the instance side" |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
989 |
self breakPoint: #jv. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
990 |
self breakPoint: #cg. |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
991 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
992 |
^aMessage sendTo: self class |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
993 |
] ifFalse:[ |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
994 |
^super doesNotUnderstand: aMessage |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
995 |
] |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
996 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
997 |
"Created: / 10-10-2011 / 14:02:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
998 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
999 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1000 |
!SourceCodeManagerUtilities methodsFor:'initialization'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1001 |
|
|
2597
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
1002 |
initialize |
| 2847 | 1003 |
confirmNewFiles := true. |
|
3551
e8feddd829f9
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3546
diff
changeset
|
1004 |
resources := self class classResources. |
|
2597
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
1005 |
|
|
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
1006 |
"Modified: / 13-10-2011 / 11:03:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 2847 | 1007 |
"Modified: / 24-07-2012 / 18:17:57 / cg" |
|
2597
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
1008 |
! |
|
fcb5d74b32d2
More code moved from Tools::NewSystemBrowser to SourceCodeManagerUtilities
vrany
parents:
2596
diff
changeset
|
1009 |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1010 |
setManager: aSourceCodeManager |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1011 |
|
| 2847 | 1012 |
manager := aSourceCodeManager. |
1013 |
manager isContainerBased ifFalse:[ |
|
1014 |
confirmNewFiles isNil "not yet set by user" ifTrue:[ |
|
1015 |
confirmNewFiles := false. |
|
1016 |
] |
|
1017 |
]. |
|
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1018 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1019 |
"Created: / 10-10-2011 / 11:47:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 2847 | 1020 |
"Modified: / 25-07-2012 / 08:35:35 / cg" |
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1021 |
! ! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1022 |
|
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1023 |
!SourceCodeManagerUtilities methodsFor:'utilities'! |
|
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1024 |
|
| 2569 | 1025 |
classIsNotYetInRepository:aClass withManager:mgr |
1026 |
|info| |
|
1027 |
||
1028 |
info := mgr sourceInfoOfClass:aClass. |
|
1029 |
||
1030 |
^ (info isNil |
|
1031 |
or:[(info at:#fileName ifAbsent:nil) isNil |
|
1032 |
or:[(info at:#module ifAbsent:nil) isNil |
|
1033 |
or:[(info at:#directory ifAbsent:nil) isNil]]]) |
|
1034 |
||
1035 |
"Created: / 25-10-2006 / 09:43:00 / cg" |
|
1036 |
! |
|
1037 |
||
| 2673 | 1038 |
defaultManager |
1039 |
^ manager |
|
1040 |
||
1041 |
"Created: / 22-12-2011 / 10:59:28 / cg" |
|
1042 |
! |
|
1043 |
||
|
2556
7d79bba1a1fa
Methods moved to an instance side (with forwarding from class side)
vrany
parents:
2539
diff
changeset
|
1044 |
nameOfExtensionsContainer |
| 1704 | 1045 |
^ 'extensions.st' |
1046 |
! |
|
1047 |
||
| 1375 | 1048 |
setPackageOfAllMethodsIn:aClass to:aPackage |
1049 |
"make all methods belong to the classes project" |
|
|
933
84fd7806afaf
offer existing modules/packages in source-container dialog
Claus Gittinger <cg@exept.de>
parents:
923
diff
changeset
|
1050 |
|
| 1375 | 1051 |
|anyChange anyChangeHere| |
| 893 | 1052 |
|
| 1375 | 1053 |
anyChange := false. |
1054 |
aClass withAllPrivateClassesDo:[:eachClass | |
|
1055 |
anyChangeHere := false. |
|
1056 |
eachClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | |
|
1057 |
mthd package ~= aPackage ifTrue:[ |
|
1058 |
mthd setPackage:aPackage. |
|
1059 |
anyChangeHere := true. |
|
1060 |
]. |
|
1061 |
]. |
|
1062 |
anyChangeHere ifTrue:[ |
|
1063 |
eachClass changed:#projectOrganization |
|
1064 |
]. |
|
1065 |
anyChangeHere ifTrue:[anyChange := true]. |
|
| 893 | 1066 |
]. |
| 1375 | 1067 |
anyChange ifTrue:[ |
1068 |
Smalltalk changed:#projectOrganization |
|
| 1185 | 1069 |
]. |
| 1375 | 1070 |
^ anyChange |
| 893 | 1071 |
! |
1072 |
||
| 2193 | 1073 |
setPackageOfAllMethodsInChangeSet:aChangeSet to:aPackage |
1074 |
"make all methods belong to the classes project" |
|
1075 |
||
1076 |
aChangeSet do:[:eachChange | |
|
1077 |
eachChange isMethodCodeChange ifTrue:[ |
|
1078 |
eachChange changeMethod package ~= aPackage ifTrue:[ |
|
1079 |
Transcript showCR:'change package of ',eachChange changeMethod whoString. |
|
1080 |
eachChange changeMethod setPackage:aPackage. |
|
1081 |
] |
|
1082 |
] |
|
1083 |
]. |
|
1084 |
! |
|
1085 |
||
|
3134
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1086 |
sourceCodeForExtensions:aCollectionOfMethods package:aPackageID forManager:scmManagerOrNil |
| 2847 | 1087 |
|s methodsSortedByName defClass| |
1088 |
||
|
3201
f0993e3fdf02
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3199
diff
changeset
|
1089 |
s := CharacterWriteStream on:(String new:1000). |
| 2847 | 1090 |
|
1091 |
s nextPutAll:'"{ Package: '''.
|
|
1092 |
s nextPutAll:aPackageID asString. |
|
1093 |
s nextPutAll:''' }"'; nextPutChunkSeparator; cr; cr. |
|
1094 |
||
1095 |
"/ don't write a timestamp. Otherwise we would always generate a new version, even if nothing changed |
|
1096 |
"/ s nextPutAll:(Smalltalk timeStamp). |
|
1097 |
"/ s nextPutChunkSeparator. |
|
1098 |
"/ s cr; cr. |
|
1099 |
||
1100 |
"/ sort them by name (to avoid conflicts due to SCM merge) |
|
1101 |
methodsSortedByName := aCollectionOfMethods asOrderedCollection. |
|
1102 |
methodsSortedByName sort:[:a :b | |
|
1103 |
|clsA clsB| |
|
1104 |
||
1105 |
clsA := a mclass name. |
|
1106 |
clsB := b mclass name. |
|
1107 |
clsA < clsB ifTrue:[ |
|
1108 |
true |
|
1109 |
] ifFalse:[ |
|
1110 |
clsA > clsB ifTrue:[ |
|
1111 |
false |
|
1112 |
] ifFalse:[ |
|
1113 |
a selector < b selector |
|
1114 |
] |
|
1115 |
] |
|
1116 |
]. |
|
1117 |
methodsSortedByName do:[:aMethod | |
|
1118 |
aMethod mclass fileOutMethod:aMethod on:s. |
|
1119 |
s cr. |
|
1120 |
]. |
|
1121 |
||
|
3134
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1122 |
scmManagerOrNil notNil ifTrue:[ |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1123 |
defClass := ProjectDefinition definitionClassForPackage:aPackageID. |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1124 |
defClass notNil ifTrue:[ |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1125 |
"/ make sure, an extensionVersion_XXX method is included... |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1126 |
"/ (notice: no need to support a secondary backward compatible non-manager related version method here) |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1127 |
(methodsSortedByName contains:[:aMethod | aMethod selector == scmManagerOrNil nameOfVersionMethodForExtensions]) ifFalse:[ |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1128 |
s nextPutLine:('!!%1 class methodsFor:''documentation''!!' bindWith:defClass name).
|
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1129 |
s cr. |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1130 |
s nextChunkPut: |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1131 |
(scmManagerOrNil versionMethodTemplateForSmalltalkFor:(scmManagerOrNil nameOfVersionMethodForExtensions)). |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1132 |
s space; nextPutChunkSeparator; cr. |
|
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
1133 |
]. |
| 2847 | 1134 |
]. |
1135 |
]. |
|
1136 |
||
1137 |
^ s contents. |
|
1138 |
||
1139 |
"Created: / 25-07-2012 / 18:38:05 / cg" |
|
1140 |
! |
|
1141 |
||
| 1375 | 1142 |
sourceCodeManagerFor:aClass |
|
3370
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
1143 |
manager notNil ifTrue:[^ manager]. |
|
9953065c1ea1
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3354
diff
changeset
|
1144 |
^ self class sourceCodeManagerFor:aClass. |
|
1449
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1145 |
! |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1146 |
|
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1147 |
sourceCodeOfClass:aClass |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1148 |
|stream src| |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1149 |
|
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1150 |
stream := '' writeStream. |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1151 |
Method flushSourceStreamCache. |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1152 |
aClass fileOutOn:stream withTimeStamp:false. |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1153 |
src := stream contents asString. |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1154 |
stream close. |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
1155 |
^ src |
|
2326
c0b55d3a8f08
added: #versionString:isLessThan:
Claus Gittinger <cg@exept.de>
parents:
2325
diff
changeset
|
1156 |
! |
|
c0b55d3a8f08
added: #versionString:isLessThan:
Claus Gittinger <cg@exept.de>
parents:
2325
diff
changeset
|
1157 |
|
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1158 |
validateConsistencyOfPackage:aPackage |
|
3146
913e76c86499
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3140
diff
changeset
|
1159 |
^ self validateConsistencyOfPackage:aPackage doClasses:true doExtensions:true |
|
913e76c86499
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3140
diff
changeset
|
1160 |
! |
|
913e76c86499
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3140
diff
changeset
|
1161 |
|
| 4359 | 1162 |
validateConsistencyOfPackage:aPackageSymbolOrClass doClasses:doClasses doExtensions:doExtensions |
|
3692
ce00ca02e94a
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3683
diff
changeset
|
1163 |
|checker report msg answer dialog problems numProblems| |
|
3155
9c22d8b4315b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3153
diff
changeset
|
1164 |
|
|
9c22d8b4315b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3153
diff
changeset
|
1165 |
"/ also done by ProjectChecker... |
|
9c22d8b4315b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3153
diff
changeset
|
1166 |
"/ defClass := aPackage asPackageId projectDefinitionClass. |
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1167 |
"/ defClass validateDescription. |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1168 |
|
|
3146
913e76c86499
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3140
diff
changeset
|
1169 |
checker := ProjectChecker new. |
|
913e76c86499
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3140
diff
changeset
|
1170 |
checker checkExtensionsOnly:(doClasses not and:[ doExtensions ]). |
| 4456 | 1171 |
checker skipCheckClasses:doClasses not. |
| 4359 | 1172 |
report := checker check: aPackageSymbolOrClass. |
|
3692
ce00ca02e94a
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3683
diff
changeset
|
1173 |
(report notNil and:[(problems := report problems) notEmptyOrNil]) ifTrue:[ |
|
ce00ca02e94a
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3683
diff
changeset
|
1174 |
numProblems := problems size. |
|
ce00ca02e94a
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3683
diff
changeset
|
1175 |
numProblems == 1 ifTrue:[ |
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1176 |
msg := 'The ProblemChecker found the following error/inconsistency:\\ %2\\Need more detail or help for repair?' |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1177 |
] ifFalse:[ |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1178 |
msg := 'The ProblemChecker found %1 errors/inconsistencies.\\Browse them for detail or repair?' |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1179 |
]. |
| 4402 | 1180 |
answer := Dialog confirmWithRaiseAbortOnCancel: |
1181 |
(msg bindWith:numProblems |
|
1182 |
with:problems first label) withCRs. |
|
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1183 |
answer == true ifTrue:[ |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1184 |
dialog := Tools::ProjectCheckerBrowser new. |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1185 |
dialog |
| 4359 | 1186 |
projectChecker: (ProjectChecker forPackage: aPackageSymbolOrClass); |
|
3692
ce00ca02e94a
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3683
diff
changeset
|
1187 |
problemList:problems; |
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1188 |
showCancel:true; |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1189 |
openModal. |
|
3155
9c22d8b4315b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3153
diff
changeset
|
1190 |
|
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1191 |
dialog accepted ifFalse:[ |
|
3433
eee3079d18d3
AbortSignal -> AbortOperationRequest
Stefan Vogel <sv@exept.de>
parents:
3425
diff
changeset
|
1192 |
AbortOperationRequest raiseRequest |
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1193 |
]. |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1194 |
]. |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1195 |
]. |
| 4402 | 1196 |
|
1197 |
"Modified: / 15-02-2019 / 09:27:46 / Claus Gittinger" |
|
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1198 |
! |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
1199 |
|
|
2326
c0b55d3a8f08
added: #versionString:isLessThan:
Claus Gittinger <cg@exept.de>
parents:
2325
diff
changeset
|
1200 |
versionString:a isLessThan:b |
|
c0b55d3a8f08
added: #versionString:isLessThan:
Claus Gittinger <cg@exept.de>
parents:
2325
diff
changeset
|
1201 |
"compare two strings of the form: a.b.c..." |
|
c0b55d3a8f08
added: #versionString:isLessThan:
Claus Gittinger <cg@exept.de>
parents:
2325
diff
changeset
|
1202 |
|
| 4287 | 1203 |
|i1 i2 a1 b1 restA restB| |
1204 |
||
1205 |
restA := a. |
|
1206 |
restB := b. |
|
1207 |
[ |
|
1208 |
i1 := restA indexOf:$. . |
|
1209 |
i2 := restB indexOf:$. . |
|
1210 |
i1 == 0 ifTrue:[ |
|
1211 |
i1 := restA size + 1. |
|
1212 |
]. |
|
1213 |
i2 == 0 ifTrue:[ |
|
1214 |
i2 := restB size + 1. |
|
1215 |
]. |
|
1216 |
||
1217 |
a1 := Integer readFrom:(restA copyTo:i1-1). |
|
1218 |
b1 := Integer readFrom:(restB copyTo:i2-1). |
|
1219 |
a1 < b1 ifTrue:[^ true]. |
|
1220 |
a1 > b1 ifTrue:[^ false]. |
|
1221 |
restA := (restA copyFrom:i1+1). |
|
1222 |
restB := (restB copyFrom:i2+1). |
|
1223 |
restA isEmpty ifTrue:[ |
|
1224 |
^ restB notEmpty |
|
1225 |
]. |
|
1226 |
restB isEmpty ifTrue:[ |
|
1227 |
^ false |
|
1228 |
]. |
|
1229 |
] loop. |
|
|
2326
c0b55d3a8f08
added: #versionString:isLessThan:
Claus Gittinger <cg@exept.de>
parents:
2325
diff
changeset
|
1230 |
|
|
c0b55d3a8f08
added: #versionString:isLessThan:
Claus Gittinger <cg@exept.de>
parents:
2325
diff
changeset
|
1231 |
" |
| 4287 | 1232 |
self assert:(self default versionString:'12.34.66' isLessThan:'12.35.66'). |
1233 |
self assert:(self default versionString:'12.34.66' isLessThan:'12.35.67'). |
|
1234 |
self assert:(self default versionString:'11.34.66' isLessThan:'12.34.67'). |
|
1235 |
self assert:(self default versionString:'11.35.66' isLessThan:'12.34.67'). |
|
1236 |
self assert:(self default versionString:'13.35.66' isLessThan:'12.34.67') not. |
|
1237 |
self assert:(self default versionString:'13.35.66' isLessThan:'13.34.67') not. |
|
1238 |
self assert:(self default versionString:'13.35.66' isLessThan:'13.35.67'). |
|
1239 |
self assert:(self default versionString:'13.35.66' isLessThan:'13.35.65') not. |
|
1240 |
self assert:(self default versionString:'13.35.66.1' isLessThan:'13.35.66') not. |
|
1241 |
self assert:(self default versionString:'13.35.66' isLessThan:'13.35.66.1'). |
|
1242 |
self assert:(self default versionString:'13.35.66.2' isLessThan:'13.35.66.1') not. |
|
1243 |
self assert:(self default versionString:'13.35.66.1' isLessThan:'13.35.66.2'). |
|
|
2326
c0b55d3a8f08
added: #versionString:isLessThan:
Claus Gittinger <cg@exept.de>
parents:
2325
diff
changeset
|
1244 |
" |
|
c0b55d3a8f08
added: #versionString:isLessThan:
Claus Gittinger <cg@exept.de>
parents:
2325
diff
changeset
|
1245 |
|
| 4287 | 1246 |
"Modified (comment): / 06-12-2017 / 12:21:56 / cg" |
| 1375 | 1247 |
! ! |
| 1160 | 1248 |
|
| 4226 | 1249 |
!SourceCodeManagerUtilities methodsFor:'utilities-encoding'! |
1250 |
||
1251 |
guessEncodingOfFile:aFilename |
|
1252 |
"look for a string |
|
1253 |
encoding #name |
|
1254 |
or: |
|
1255 |
encoding: name |
|
1256 |
within the given buffer |
|
1257 |
(which is usually the first few bytes of a textFile). |
|
1258 |
If that's not found, use heuristics (in CharacterArray) to guess." |
|
1259 |
||
1260 |
<resource: #obsolete> |
|
1261 |
||
1262 |
self obsoleteMethodWarning:'ask CharacterEncoder'. |
|
1263 |
^ CharacterEncoder guessEncodingOfFile:aFilename |
|
1264 |
||
1265 |
" |
|
1266 |
SourceCodeManagerUtilities guessEncodingOfFile:'../../libview2/resources/ApplicationModel_de.rs' asFilename |
|
1267 |
SourceCodeManagerUtilities guessEncodingOfFile:'../../libview2/resources/ApplicationModel_ru.rs' asFilename |
|
1268 |
" |
|
1269 |
||
1270 |
"Modified (comment): / 14-01-2012 / 20:54:35 / cg" |
|
1271 |
! |
|
1272 |
||
1273 |
guessEncodingOfStream:aStream |
|
1274 |
"look for a string of the form |
|
1275 |
encoding #name |
|
1276 |
or: |
|
1277 |
encoding: name |
|
1278 |
in the first few bytes of aStream." |
|
1279 |
||
1280 |
<resource: #obsolete> |
|
1281 |
||
1282 |
self obsoleteMethodWarning:'ask CharacterEncoder'. |
|
1283 |
^ CharacterEncoder guessEncodingOfStream:aStream |
|
1284 |
! ! |
|
1285 |
||
1286 |
!SourceCodeManagerUtilities methodsFor:'utilities-scm'! |
|
|
973
b9004b37290a
check for #halt and #error when checking in
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
1287 |
|
| 4201 | 1288 |
askForPackageVersion:question with:includeSubProjectsHolderOrNil knownTags:knownTags into:aTwoArgBlock |
1289 |
|dateFormat string dateOrNil symbolicNameOrNil| |
|
1290 |
||
1291 |
dateFormat := UserPreferences current dateInputFormat. |
|
1292 |
||
1293 |
Dialog |
|
1294 |
modifyingBoxWith:[:box | |
|
1295 |
includeSubProjectsHolderOrNil notNil ifTrue:[ |
|
1296 |
box verticalPanel |
|
1297 |
add:(CheckBox label:(resources string:'Include Subprojects') |
|
1298 |
model:includeSubProjectsHolderOrNil). |
|
1299 |
] |
|
1300 |
] |
|
1301 |
do:[ |
|
1302 |
|suggestion| |
|
1303 |
||
1304 |
suggestion := LastComparedTag. |
|
1305 |
suggestion isNil ifTrue:[ suggestion := Date today printStringFormat:dateFormat ]. |
|
1306 |
||
1307 |
string := Dialog |
|
1308 |
request:(resources string:question with:dateFormat) |
|
1309 |
initialAnswer:suggestion |
|
1310 |
list:knownTags. |
|
1311 |
]. |
|
1312 |
||
1313 |
string notEmptyOrNil ifTrue:[ |
|
1314 |
dateOrNil := Date readFrom:string printFormat:dateFormat onError:nil. |
|
1315 |
dateOrNil isNil ifTrue:[ |
|
1316 |
symbolicNameOrNil := string |
|
1317 |
]. |
|
1318 |
aTwoArgBlock value:dateOrNil value:symbolicNameOrNil. |
|
1319 |
]. |
|
1320 |
^ string |
|
1321 |
||
1322 |
"Created: / 04-02-2017 / 18:39:11 / cg" |
|
1323 |
"Modified: / 05-02-2017 / 04:24:23 / cg" |
|
1324 |
! |
|
1325 |
||
| 2691 | 1326 |
changeSetForExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision usingManager:aSourceCodeManager |
| 4266 | 1327 |
"check-out an extension container from the source repository, |
1328 |
and return the methods there as a change set. |
|
|
1841
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1329 |
If askForRevision is false, check-out the newest version. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1330 |
Return a changeSet or nil (if any error occurred)" |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1331 |
|
|
2242
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1332 |
^ self |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1333 |
changeSetForExtensionMethodsForPackage:packageToCheckOut |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1334 |
revision:nil orAskForRevision:askForRevision |
| 2691 | 1335 |
usingManager:aSourceCodeManager |
1336 |
||
1337 |
"Created: / 29-12-2011 / 14:26:01 / cg" |
|
| 4266 | 1338 |
"Modified (comment): / 21-11-2017 / 13:08:54 / cg" |
|
2242
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1339 |
! |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1340 |
|
| 2691 | 1341 |
changeSetForExtensionMethodsForPackage:packageToCheckOut revision:revisionOrNil orAskForRevision:askForRevision usingManager:aSourceCodeManager |
|
2242
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1342 |
"check-out an extension container from the source repository, and return the methods there as a change set. |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1343 |
If askForRevision is false, check-out the newest version. |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1344 |
Return a changeSet or nil (if any error occurred)" |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1345 |
|
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
1346 |
|directory module file aStream sourceToLoad rev msg newestRev | |
|
1841
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1347 |
|
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1348 |
directory := packageToCheckOut asPackageId directory. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1349 |
module := packageToCheckOut asPackageId module. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1350 |
file := self nameOfExtensionsContainer. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1351 |
|
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1352 |
"/ |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1353 |
"/ ask for revision |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1354 |
"/ |
|
2242
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1355 |
(rev := revisionOrNil) isNil ifTrue:[ |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1356 |
newestRev := aSourceCodeManager newestRevisionInFile:file directory:directory module:module. |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1357 |
askForRevision ifFalse:[ |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1358 |
rev := newestRev ? '' |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1359 |
] ifTrue:[ |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1360 |
msg := resources string:'CheckOut which revision of extensions for ''%1'': (empty for newest)' with:packageToCheckOut allBold. |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1361 |
newestRev notNil ifTrue:[ |
|
3261
7a585999dcef
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3259
diff
changeset
|
1362 |
msg := msg , '\' , (resources string:'Newest in repository is %1.' with:newestRev) |
|
2242
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1363 |
]. |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1364 |
|
| 2791 | 1365 |
rev := self |
|
2242
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1366 |
askForExistingRevision:msg |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1367 |
title:'CheckOut from repository' |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1368 |
class:nil |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1369 |
manager:aSourceCodeManager |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1370 |
module:module package:directory fileName:file. |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1371 |
|
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1372 |
rev isNil ifTrue:[ |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1373 |
^ nil "/ canceled |
|
8ea64354212d
added: #changeSetForExtensionMethodsForPackage:revision:orAskForRevision:using:
Claus Gittinger <cg@exept.de>
parents:
2237
diff
changeset
|
1374 |
]. |
|
1841
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1375 |
]. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1376 |
]. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1377 |
rev withoutSpaces isEmpty ifTrue:[ |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1378 |
rev := #newest. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1379 |
msg := 'extracting newest %1 (' , (newestRev ? '???') , ')'.
|
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1380 |
] ifFalse:[ |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1381 |
msg := 'extracting previous %1'. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1382 |
]. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1383 |
aStream := aSourceCodeManager |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1384 |
streamForClass:nil |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1385 |
fileName:file |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1386 |
revision:rev |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1387 |
directory:directory |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1388 |
module:module |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1389 |
cache:true. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1390 |
|
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1391 |
aStream isNil ifTrue:[ |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1392 |
self warn:(resources string:'Could not extract "extensions.st" for %1 from repository' with:packageToCheckOut allBold). |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1393 |
^ nil |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1394 |
]. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1395 |
aStream class readErrorSignal handle:[:ex | |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1396 |
self warn:('read error while reading extracted source\\' , ex description) withCRs.
|
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1397 |
aStream close. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1398 |
^ nil |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1399 |
] do:[ |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1400 |
sourceToLoad := aStream contents asString. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1401 |
]. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1402 |
aStream close. |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1403 |
^ ChangeSet fromStream:(sourceToLoad readStream). |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1404 |
|
| 2691 | 1405 |
"Created: / 29-12-2011 / 14:27:00 / cg" |
|
1841
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1406 |
! |
|
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
1407 |
|
| 2691 | 1408 |
checkForExistingModule:module directory:directory container:containerFileName usingManager:mgr allowCreate:allowCreate |
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
1409 |
|moduleName directoryName containerName| |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
1410 |
|
| 1158 | 1411 |
moduleName := module allBold. |
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
1412 |
directoryName := directory allBold. |
| 1158 | 1413 |
containerName := containerFileName allBold. |
1414 |
||
1415 |
"/ |
|
1416 |
"/ check for the container |
|
1417 |
"/ |
|
| 1787 | 1418 |
(mgr checkForExistingContainer:containerFileName inModule:module directory:directory) ifFalse:[ |
| 1158 | 1419 |
allowCreate ifFalse:[ |
1420 |
self warn:(resources string:'A container for ''%1'' does not exist in ''%2:%3''' |
|
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
1421 |
with:containerName with:moduleName with:directoryName) withCRs. |
| 1158 | 1422 |
^ false |
1423 |
]. |
|
1424 |
(Dialog |
|
1425 |
confirm:(resources string:'''%1'' is a new container (in ''%2:%3'').\\Create it ?' |
|
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
1426 |
with:containerName with:moduleName with:directoryName) withCRs |
| 1158 | 1427 |
noLabel:'Cancel') |
1428 |
ifFalse:[ |
|
1429 |
^ false. |
|
1430 |
]. |
|
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
1431 |
(mgr createContainerForText:'' inModule:module package:directory container:containerFileName) ifFalse:[ |
| 1158 | 1432 |
self warn:(resources string:'Cannot create new container: ''%1'' (in ''%2:%3'')' |
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
1433 |
with:containerName with:moduleName with:directoryName). |
| 1158 | 1434 |
^ false. |
1435 |
] |
|
1436 |
]. |
|
1437 |
^ true. |
|
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
1438 |
|
| 1787 | 1439 |
"Modified: / 13-09-2006 / 18:24:57 / cg" |
| 2691 | 1440 |
"Created: / 29-12-2011 / 14:35:36 / cg" |
| 1158 | 1441 |
! |
1442 |
||
| 2691 | 1443 |
checkForExistingModule:module directory:directory usingManager:mgr allowCreate:allowCreate |
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
1444 |
|moduleNameBold directoryNameBold| |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
1445 |
|
| 1704 | 1446 |
moduleNameBold := module allBold. |
1447 |
directoryNameBold := directory allBold. |
|
| 1158 | 1448 |
|
1449 |
"/ |
|
| 1704 | 1450 |
"/ check for the directory |
| 1158 | 1451 |
"/ |
| 1840 | 1452 |
(mgr checkForExistingModule:module directory:directory) ifFalse:[ |
| 1158 | 1453 |
allowCreate ifFalse:[ |
| 1704 | 1454 |
self warn:(resources string:'A directory for ''%1'' does not exist in module ''%2''' |
1455 |
with:directoryNameBold with:moduleNameBold) withCRs. |
|
| 1158 | 1456 |
^ false |
1457 |
]. |
|
1458 |
(Dialog |
|
| 2651 | 1459 |
confirm:(resources stringWithCRs:'''%1'' is a new directory in module ''%2''.\\Create it in %3?' |
1460 |
with:directoryNameBold |
|
1461 |
with:moduleNameBold |
|
1462 |
with:mgr managerTypeName) |
|
| 1158 | 1463 |
noLabel:'Cancel') |
1464 |
ifFalse:[ |
|
1465 |
^ false. |
|
1466 |
]. |
|
| 1840 | 1467 |
(mgr createModule:module directory:directory) ifFalse:[ |
| 2651 | 1468 |
self warn:(resources stringWithCRs:'Cannot create new directory: ''%1'' in module ''%2'' in %3' |
1469 |
with:directoryNameBold |
|
1470 |
with:moduleNameBold |
|
1471 |
with:mgr managerTypeName). |
|
| 1158 | 1472 |
^ false. |
1473 |
] |
|
1474 |
]. |
|
1475 |
^ true. |
|
| 1840 | 1476 |
|
| 2651 | 1477 |
"Modified: / 21-12-2011 / 18:46:11 / cg" |
| 2691 | 1478 |
"Created: / 29-12-2011 / 14:35:20 / cg" |
| 1158 | 1479 |
! |
1480 |
||
| 2691 | 1481 |
checkForExistingModule:module usingManager:mgr allowCreate:allowCreate |
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
1482 |
|moduleName answer| |
| 1158 | 1483 |
|
1484 |
(mgr checkForExistingModule:module) ifFalse:[ |
|
1485 |
moduleName := module allBold. |
|
1486 |
||
1487 |
allowCreate ifFalse:[ |
|
| 1423 | 1488 |
self warn:(resources stringWithCRs:'A module named ''%1'' does not exist in the repository' |
1489 |
with:moduleName) . |
|
| 1158 | 1490 |
^ false |
1491 |
]. |
|
| 2325 | 1492 |
AbortAllOperationWantedQuery query ifTrue:[ |
| 1483 | 1493 |
answer := Dialog |
1494 |
confirmWithCancel:(resources stringWithCRs:'''%1'' is a new module.\\create it ?' with:moduleName) |
|
1495 |
labels:(resources array:#('Cancel All' 'Cancel' 'Yes' )).
|
|
1496 |
answer isNil ifTrue:[ AbortAllOperationRequest raise ]. |
|
1497 |
] ifFalse:[ |
|
1498 |
answer := Dialog |
|
| 2651 | 1499 |
confirm:(resources stringWithCRs:'''%1'' is a new module in %2.\\create it ?' with:moduleName with:mgr managerTypeName) |
| 1483 | 1500 |
noLabel:'Cancel' |
1501 |
]. |
|
1502 |
answer ifFalse:[ ^ false]. |
|
| 1158 | 1503 |
|
1504 |
(mgr createModule:module) ifFalse:[ |
|
| 2651 | 1505 |
self warn:(resources stringWithCRs:'Cannot create new module: ''%1'' in %2' with:moduleName with:mgr managerTypeName) . |
| 1158 | 1506 |
^ false. |
1507 |
] |
|
1508 |
]. |
|
1509 |
^ true. |
|
| 2325 | 1510 |
|
| 2651 | 1511 |
"Modified: / 21-12-2011 / 18:42:03 / cg" |
| 2691 | 1512 |
"Created: / 29-12-2011 / 14:35:06 / cg" |
| 1158 | 1513 |
! |
1514 |
||
|
3534
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1515 |
checkOutPackages: packages askForRevision: askForRevision |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1516 |
"Updates code of given packages (loaded in the image) to a specific revision. |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1517 |
If `askForRevision` is true, then user is asked to specify to which revision to |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1518 |
update. If `askForRevision` is false, then packages are updated to a 'newest' |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1519 |
revision. |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1520 |
|
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1521 |
NOTE: Definition of `newest` revision may vary. For SCMs which allows for multiple |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1522 |
heads, it is not clear which one it is. In that case, even if `askForRevision` is |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1523 |
false, this method may result in user interation, asking user to select which of the |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1524 |
newest she wants. |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1525 |
|
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1526 |
NOTE: Naming is bit confusing, it should be something like #updatePackages:ask... |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1527 |
but to keep this in line with other methods, we use #checkOutPackages" |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1528 |
|
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1529 |
^ self subclassResponsibility. |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1530 |
|
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1531 |
"Created: / 01-04-2014 / 21:50:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1532 |
! |
|
914309d517ed
class: SourceCodeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3514
diff
changeset
|
1533 |
|
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1534 |
checkinClass:aClass |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1535 |
"check a class into the source repository. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1536 |
Asks interactively for a log-message." |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1537 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1538 |
^ self checkinClass:aClass withInfo:nil |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1539 |
! |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1540 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1541 |
checkinClass:aClass withInfo:aLogInfoOrNil |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1542 |
"check a class into the source repository. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1543 |
If the argument, aLogInfoOrNil isNil, ask interactively for a log-message." |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1544 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1545 |
^ self checkinClass:aClass withInfo:aLogInfoOrNil withCheck:true |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1546 |
! |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1547 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1548 |
checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClass |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1549 |
"check a class into the source repository. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1550 |
If the argument, aLogInfoOrNil isNil, ask interactively for log-message. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1551 |
If doCheckClass is true, the class is checked for send of halts etc." |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1552 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1553 |
^ self |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1554 |
checkinClass:aClass |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1555 |
withInfo:aLogInfoOrNil |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1556 |
withCheck:doCheckClass |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1557 |
usingManager:(self sourceCodeManagerFor:aClass) |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1558 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1559 |
"Modified: / 21-12-2011 / 18:19:55 / cg" |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1560 |
! |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1561 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1562 |
checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClassHolder usingManager:managerOrNil |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1563 |
"check a class into the source repository. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1564 |
If the argument, aLogInfoOrNil isNil, ask interactively for log-message. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1565 |
If doCheckClass is true, the class is checked for send of halts etc." |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1566 |
|
| 3992 | 1567 |
^ self |
1568 |
checkinClass:aClass |
|
1569 |
withInfo:aLogInfoOrNil withCheck:doCheckClassHolder |
|
1570 |
usingManager:managerOrNil |
|
1571 |
confirmNewContainer:confirmNewFiles |
|
1572 |
! |
|
1573 |
||
1574 |
checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClassHolder usingManager:managerOrNil confirmNewContainer:confirmNewContainer |
|
1575 |
"check a class into the source repository. |
|
1576 |
If the argument, aLogInfoOrNil isNil, ask interactively for log-message. |
|
1577 |
If doCheckClass is true, the class is checked for send of halts etc." |
|
1578 |
||
| 4276 | 1579 |
^ self |
1580 |
checkinClass:aClass |
|
1581 |
withInfo:aLogInfoOrNil withCheck:doCheckClassHolder |
|
1582 |
usingManager:managerOrNil confirmNewContainer:confirmNewContainer |
|
1583 |
onBranch:nil |
|
1584 |
||
1585 |
"Created: / 21-12-2011 / 18:19:14 / cg" |
|
1586 |
"Modified: / 05-12-2017 / 20:26:38 / cg" |
|
1587 |
! |
|
1588 |
||
1589 |
checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClassHolder usingManager:managerOrNil confirmNewContainer:confirmNewContainer onBranch:branchNameOrNil |
|
1590 |
"check a class into the source repository. |
|
1591 |
If the argument, aLogInfoOrNil isNil, ask interactively for log-message. |
|
1592 |
If doCheckClass is true, the class is checked for send of halts etc." |
|
1593 |
||
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1594 |
|logMessage checkinInfo mgr pri| |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1595 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1596 |
aClass isLoaded ifFalse:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1597 |
self information:(resources string:'Cannot checkin unloaded classes (%1)' with:aClass name). |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1598 |
^ false. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1599 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1600 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1601 |
mgr := managerOrNil. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1602 |
mgr isNil ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1603 |
mgr := self sourceCodeManagerFor:aClass. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1604 |
mgr isNil ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1605 |
^ false |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1606 |
] |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1607 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1608 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1609 |
self ensureCorrectVersionMethodsInClass:aClass usingManager:mgr. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1610 |
mgr supportsCheckinLogMessages ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1611 |
(self |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1612 |
getLogMessageForClassCheckinTakingDefaultsFromPreviousLogInfo:aLogInfoOrNil |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1613 |
forClass:aClass |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1614 |
valuesInto:[:logMessageRet :checkinInfoRet | |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1615 |
logMessage := logMessageRet. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1616 |
checkinInfo := checkinInfoRet. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1617 |
] |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1618 |
) ifFalse:[^ false]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1619 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1620 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1621 |
(self classIsNotYetInRepository:aClass withManager:mgr) ifTrue:[ |
| 3992 | 1622 |
(self createSourceContainerForClass:aClass usingManager:mgr confirmNewContainer:confirmNewContainer) ifFalse:[ |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1623 |
"/ self warn:'did not create a container for ''' , aClass name , ''''. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1624 |
^ false |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1625 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1626 |
^ true. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1627 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1628 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1629 |
self activityNotification:(resources string:'checking in %1' with:aClass name). |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1630 |
pri := Processor activePriority. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1631 |
Processor activeProcess withPriority:pri-1 to:pri |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1632 |
do:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1633 |
|revision aborted freshCreated| |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1634 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1635 |
freshCreated := false. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1636 |
revision := aClass revision. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1637 |
revision isNil ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1638 |
mgr isContainerBased ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1639 |
"/ mhmh - check if it has a container. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1640 |
(mgr checkForExistingContainerForClass:aClass) ifFalse:[ |
| 3992 | 1641 |
(self createSourceContainerForClass:aClass usingManager:mgr confirmNewContainer:confirmNewContainer) ifFalse:[ |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1642 |
self warn:'Did not create/change repository container for ''' , aClass name allBold , ''''. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1643 |
^ false. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1644 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1645 |
freshCreated := true. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1646 |
] |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1647 |
] |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1648 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1649 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1650 |
doCheckClassHolder value ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1651 |
"/ check if the class contains halts, error-sends etc. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1652 |
(self checkAndWarnAboutBadMessagesInClass:aClass checkAgainHolder:doCheckClassHolder) ifFalse:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1653 |
^ false |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1654 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1655 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1656 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1657 |
freshCreated ifFalse:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1658 |
aborted := false. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1659 |
AbortOperationRequest handle:[:ex | |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1660 |
aborted := true. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1661 |
ex return. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1662 |
] do:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1663 |
|checkinState cause| |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1664 |
checkinState := false. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1665 |
cause := ''. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1666 |
[ |
| 4276 | 1667 |
checkinState := mgr checkinClass:aClass logMessage:logMessage onBranch:branchNameOrNil |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1668 |
] on:SourceCodeManagerError do:[:ex| |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1669 |
cause := ex description. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1670 |
"/ ex proceed. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1671 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1672 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1673 |
checkinState ifFalse:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1674 |
Transcript showCR:'checkin of ''' , aClass name , ''' failed - ', cause. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1675 |
self warn:(resources stringWithCRs:'Checkin of "%1" failed\\' with:aClass name allBold),cause. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1676 |
AbortOperationRequest raise. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1677 |
"/ ^ false. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1678 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1679 |
checkinInfo notNil ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1680 |
checkinInfo isStable ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1681 |
"set stable tag for class that has been checked in" |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1682 |
self tagClass:aClass as:#stable. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1683 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1684 |
checkinInfo tagIt ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1685 |
"set any additional tags for the class that has been checked in" |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1686 |
(checkinInfo tag asCollectionOfSubstringsSeparatedByAny:',;') do:[:eachTag | |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1687 |
self tagClass:aClass as:eachTag withoutSeparators. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1688 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1689 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1690 |
CVSSourceCodeManager recentTag:checkinInfo tag. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1691 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1692 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1693 |
aborted ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1694 |
Transcript showCR:'Checkin of ''' , aClass name , ''' aborted'. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1695 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1696 |
AbortAllOperationWantedQuery query ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1697 |
(Dialog |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1698 |
confirm:(resources stringWithCRs:'Checkin of "%1" aborted.\\Cancel all ?' with:aClass name) |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1699 |
default:false) |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1700 |
ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1701 |
AbortAllOperationRequest raise. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1702 |
] |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1703 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1704 |
^ false. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1705 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1706 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1707 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1708 |
^ true |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1709 |
|
| 4276 | 1710 |
"Created: / 05-12-2017 / 20:26:09 / cg" |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1711 |
! |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1712 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1713 |
checkinClasses:aCollectionOfClass |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1714 |
"check a collection of classes into the source repository. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1715 |
Asks interactively for log-message." |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1716 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1717 |
^ self checkinClasses:aCollectionOfClass withInfo:nil |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1718 |
! |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1719 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1720 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1721 |
"check a bunch of classes into the source repository. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1722 |
If the argument, aLogInfoOrNil isNil, ask interactively for log-message." |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1723 |
|
| 4276 | 1724 |
^ self checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil onBranch:nil |
1725 |
||
1726 |
"Modified: / 05-12-2017 / 20:15:25 / cg" |
|
1727 |
! |
|
1728 |
||
1729 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrNil onBranch:branchNameOrNil |
|
1730 |
"check a bunch of classes into the source repository. |
|
1731 |
If the argument, aLogInfoOrNil isNil, ask interactively for log-message." |
|
1732 |
||
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1733 |
|checkClassWhenCheckingInHolder| |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1734 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1735 |
checkClassWhenCheckingInHolder := ValueHolder with:(UserPreferences current at:#checkClassesWhenCheckingIn ifAbsent:true). |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1736 |
checkClassWhenCheckingInHolder |
| 4276 | 1737 |
onChangeEvaluate:[ |
1738 |
UserPreferences current at:#checkClassesWhenCheckingIn put:checkClassWhenCheckingInHolder value |
|
1739 |
]. |
|
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1740 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1741 |
^ self |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1742 |
checkinClasses:aCollectionOfClasses |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1743 |
withInfo:aLogInfoOrNil |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1744 |
withCheck:checkClassWhenCheckingInHolder |
| 4276 | 1745 |
onBranch:branchNameOrNil |
1746 |
||
1747 |
"Created: / 05-12-2017 / 20:15:09 / cg" |
|
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1748 |
! |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1749 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1750 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1751 |
"check a bunch of classes into the source repository. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1752 |
If the argument, aLogInfoOrStringNil isNil, ask interactively for log-message." |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1753 |
|
| 4276 | 1754 |
^ self checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder onBranch:nil |
1755 |
||
1756 |
"Modified: / 05-12-2017 / 20:16:18 / cg" |
|
1757 |
! |
|
1758 |
||
1759 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder onBranch:branchNameOrNil |
|
1760 |
"check a bunch of classes into the source repository. |
|
1761 |
If the argument, aLogInfoOrStringNil isNil, ask interactively for log-message." |
|
1762 |
||
1763 |
^ self checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringNil withCheck:doCheckClassesHolder usingManager:nil onBranch:branchNameOrNil |
|
1764 |
||
1765 |
"Created: / 05-12-2017 / 20:15:59 / cg" |
|
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1766 |
! |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1767 |
|
|
3818
25607a4f1e98
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3814
diff
changeset
|
1768 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1769 |
"check a bunch of classes into the source repository. |
|
3818
25607a4f1e98
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3814
diff
changeset
|
1770 |
If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message." |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1771 |
|
| 3992 | 1772 |
^ self |
| 4276 | 1773 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil |
1774 |
onBranch:nil |
|
1775 |
||
1776 |
"Modified: / 05-12-2017 / 20:17:32 / cg" |
|
| 3992 | 1777 |
! |
1778 |
||
1779 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder |
|
1780 |
usingManager:aManagerOrNil confirmNewContainer:confirmNewContainer |
|
| 4276 | 1781 |
|
1782 |
"check a bunch of classes into the source repository. |
|
1783 |
If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message." |
|
1784 |
||
1785 |
^ self |
|
1786 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder |
|
1787 |
usingManager:aManagerOrNil confirmNewContainer:confirmNewContainer onBranch:nil |
|
1788 |
||
1789 |
"Created: / 21-12-2011 / 18:24:25 / cg" |
|
1790 |
"Modified (format): / 05-12-2017 / 20:24:09 / cg" |
|
1791 |
! |
|
1792 |
||
1793 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder |
|
1794 |
usingManager:aManagerOrNil confirmNewContainer:confirmNewContainer onBranch:branchNameOrNil |
|
| 3992 | 1795 |
"check a bunch of classes into the source repository. |
1796 |
If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message." |
|
1797 |
||
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1798 |
|classes allClasses checkinInfoOrString yesOrNoToAll unchangedClasses| |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1799 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1800 |
"/ ignore private classes |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1801 |
classes := aCollectionOfClasses select:[:aClass | aClass owningClass isNil]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1802 |
classes isEmpty ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1803 |
self information:'Only private classes given - nothing checked in.'. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1804 |
^ self |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1805 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1806 |
classes := classes select:[:aClass | aClass isLoaded]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1807 |
classes isEmpty ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1808 |
self information:'Only unloaded classes given - nothing checked in.'. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1809 |
^ self |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1810 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1811 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1812 |
classes size == 1 ifTrue:[ |
| 3992 | 1813 |
self |
1814 |
checkinClass:classes first |
|
1815 |
withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder |
|
1816 |
usingManager:aManagerOrNil |
|
| 4281 | 1817 |
confirmNewContainer:confirmNewContainer |
1818 |
onBranch:branchNameOrNil. |
|
| 3992 | 1819 |
^ self |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1820 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1821 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1822 |
"ask once, for all classes" |
|
3818
25607a4f1e98
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3814
diff
changeset
|
1823 |
aLogInfoOrStringOrNil isNil ifTrue:[ |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1824 |
checkinInfoOrString := self |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1825 |
getCheckinInfoFor:(resources string:'%1 classes to checkin' with:aCollectionOfClasses size) |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1826 |
initialAnswer:nil |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1827 |
withQuickOption:true. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1828 |
checkinInfoOrString isNil ifTrue:[^ self]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1829 |
] ifFalse:[ |
|
3818
25607a4f1e98
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3814
diff
changeset
|
1830 |
checkinInfoOrString := aLogInfoOrStringOrNil. |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1831 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1832 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1833 |
allClasses := classes. |
|
3818
25607a4f1e98
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3814
diff
changeset
|
1834 |
(checkinInfoOrString isString not and:[checkinInfoOrString quickCheckIn]) ifTrue:[ |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1835 |
"/ not only the one's in the changeSet; |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1836 |
"/ also those which have not been checked in before. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1837 |
classes := classes select:[:each | each hasUnsavedChanges or:[ (each revisionOfManager:aManagerOrNil) isNil ]]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1838 |
classes isEmpty ifTrue:[ Dialog information:'no changes to checkin (quickCheckIn)' ] |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1839 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1840 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1841 |
"abortAll is handled, and also asked for here!!" |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1842 |
AbortAllOperationRequest handleAndAnswerQueryIn:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1843 |
classes notEmpty ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1844 |
self yesToAllNotification handle:[:ex | |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1845 |
yesOrNoToAll := ex parameter. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1846 |
ex proceed |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1847 |
] do:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1848 |
self yesToAllQuery handle:[:ex | |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1849 |
ex proceedWith:yesOrNoToAll |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1850 |
] do:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1851 |
classes do:[:aClass | |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1852 |
self activityNotification:(resources string:'checking in %1' with:aClass name). |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1853 |
"/ ca does not want boxes to pop up all over ... |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1854 |
UserInformation handle:[:ex | |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1855 |
Transcript showCR:ex description. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1856 |
ex proceed. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1857 |
] do:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1858 |
AbortOperationRequest catch:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1859 |
self |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1860 |
checkinClass:aClass |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1861 |
withInfo:checkinInfoOrString |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1862 |
withCheck:doCheckClassesHolder |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1863 |
usingManager:aManagerOrNil |
| 3992 | 1864 |
confirmNewContainer:confirmNewContainer |
| 4281 | 1865 |
onBranch:branchNameOrNil |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1866 |
] |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1867 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1868 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1869 |
] |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1870 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1871 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1872 |
|
|
3818
25607a4f1e98
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3814
diff
changeset
|
1873 |
(checkinInfoOrString isString not and:[ (checkinInfoOrString isStable or:[checkinInfoOrString tagIt]) ]) |
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1874 |
ifTrue:[ |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1875 |
"/mhmh - but tag should be set on all (even unchanged ones) |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1876 |
"/ the other onces have already been tagged |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1877 |
unchangedClasses := allClasses reject:[:eachClass | (classes includes:eachClass)]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1878 |
|
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1879 |
"mhmh - could still have to tag them" |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1880 |
checkinInfoOrString isStable ifTrue:[ |
| 4281 | 1881 |
self tagClasses:unchangedClasses as:#stable. |
1882 |
"/ unchangedClasses do:[:eachClass | |
|
1883 |
"/ self tagClass:eachClass as:#stable. |
|
1884 |
"/ ]. |
|
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1885 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1886 |
checkinInfoOrString tagIt ifTrue:[ |
| 4281 | 1887 |
self tagClasses:unchangedClasses as:(checkinInfoOrString tag). |
1888 |
"/ unchangedClasses do:[:eachClass | |
|
1889 |
"/ self tagClass:eachClass as:(checkinInfoOrString tag). |
|
1890 |
"/ ]. |
|
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1891 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1892 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1893 |
]. |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1894 |
|
| 4276 | 1895 |
"Created: / 05-12-2017 / 20:23:37 / cg" |
| 4281 | 1896 |
"Modified: / 05-12-2017 / 23:34:56 / cg" |
| 4276 | 1897 |
! |
1898 |
||
1899 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder usingManager:aManagerOrNil onBranch:branchNameOrNil |
|
1900 |
"check a bunch of classes into the source repository. |
|
1901 |
If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message." |
|
1902 |
||
1903 |
^ self |
|
1904 |
checkinClasses:aCollectionOfClasses withInfo:aLogInfoOrStringOrNil withCheck:doCheckClassesHolder |
|
1905 |
usingManager:aManagerOrNil |
|
1906 |
confirmNewContainer:confirmNewFiles |
|
1907 |
onBranch:branchNameOrNil |
|
1908 |
||
1909 |
"Created: / 05-12-2017 / 20:17:16 / cg" |
|
1910 |
! |
|
1911 |
||
1912 |
checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages |
|
1913 |
^ self |
|
1914 |
checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions |
|
1915 |
buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages |
|
1916 |
onBranch:nil |
|
1917 |
||
1918 |
"Created: / 05-12-2017 / 20:02:49 / cg" |
|
1919 |
! |
|
1920 |
||
1921 |
checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages onBranch:branchNameOrNil |
|
1922 |
self subclassResponsibility |
|
1923 |
||
1924 |
"Created: / 05-12-2017 / 20:02:34 / cg" |
|
|
3602
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1925 |
! |
|
d5a67c9e51dd
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3594
diff
changeset
|
1926 |
|
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1927 |
checkoutClass:aClass askForMerge:askForMerge |
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1928 |
"check-out a class from the source repository." |
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1929 |
|
| 1006 | 1930 |
self |
1931 |
checkoutClass:aClass |
|
1932 |
askForRevision:true |
|
1933 |
askForMerge:askForMerge |
|
1934 |
! |
|
1935 |
||
1936 |
checkoutClass:aClass askForRevision:askForRevision askForMerge:askForMerge |
|
1937 |
"check-out a class from the source repository. |
|
1938 |
If askForRevision is false, check-out the newest version." |
|
1939 |
||
|
2013
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
1940 |
self |
|
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
1941 |
checkoutClass:aClass askForRevision:askForRevision askForMerge:askForMerge |
|
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
1942 |
askForConfirmation:true |
|
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
1943 |
! |
|
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
1944 |
|
|
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
1945 |
checkoutClass:aClass askForRevision:askForRevision askForMerge:askForMerge askForConfirmation:askForConfirmation |
|
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
1946 |
"check-out a class from the source repository. |
|
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
1947 |
If askForRevision is false, check-out the newest version." |
|
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
1948 |
|
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
1949 |
|mgr sourceInfo |
| 1339 | 1950 |
currentClass inChangeSet |
|
1055
f44b12442c58
version update after load from rep.
Claus Gittinger <cg@exept.de>
parents:
1054
diff
changeset
|
1951 |
aStream sourceToLoad currentSource rev revString |
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1952 |
nm msg rev2 newestRev |
| 1030 | 1953 |
containerModule containerPackage containerFile rslt |
1954 |
pkg listHere listRep diffSet |
|
| 1054 | 1955 |
changed onlyHere onlyInRep answer labels values singleChangeSelector |
|
1879
3ca8838014ee
dont ask for changeSet-compression if the loaded
Claus Gittinger <cg@exept.de>
parents:
1877
diff
changeset
|
1956 |
changedClasses default versionMethodsHere versionMethodsRep changedClassDefinitions |
|
3ca8838014ee
dont ask for changeSet-compression if the loaded
Claus Gittinger <cg@exept.de>
parents:
1877
diff
changeset
|
1957 |
wasInChangeSetBefore| |
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1958 |
|
|
1189
fdc5e747c184
refactored check for a valid sourceCodeManager into one place
Claus Gittinger <cg@exept.de>
parents:
1185
diff
changeset
|
1959 |
aClass isNil ifTrue:[self error:'nil class']. |
| 1158 | 1960 |
|
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1961 |
currentClass := aClass theNonMetaclass. |
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1962 |
|
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1963 |
nm := currentClass name. |
|
1189
fdc5e747c184
refactored check for a valid sourceCodeManager into one place
Claus Gittinger <cg@exept.de>
parents:
1185
diff
changeset
|
1964 |
mgr := self sourceCodeManagerFor:currentClass. |
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1965 |
mgr isNil ifTrue:[ |
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1966 |
^ self |
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
1967 |
]. |
| 1084 | 1968 |
|
1969 |
sourceInfo := mgr sourceInfoOfClass:currentClass. |
|
1970 |
sourceInfo notNil ifTrue:[ |
|
|
2209
e3a4510c45f2
Project noProjectID -> PackageId noProjectID
Claus Gittinger <cg@exept.de>
parents:
2200
diff
changeset
|
1971 |
currentClass package ~= PackageId noProjectID ifTrue:[ |
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
1972 |
containerPackage := mgr directoryFromSourceInfo:sourceInfo. |
| 1084 | 1973 |
containerModule := mgr moduleFromSourceInfo:sourceInfo. |
1974 |
]. |
|
1975 |
containerFile := mgr containerFromSourceInfo:sourceInfo. |
|
1976 |
]. |
|
1977 |
||
|
989
bb70a0f30e98
care for autoloaded classes when checking out
Claus Gittinger <cg@exept.de>
parents:
987
diff
changeset
|
1978 |
currentClass isLoaded ifTrue:[ |
|
bb70a0f30e98
care for autoloaded classes when checking out
Claus Gittinger <cg@exept.de>
parents:
987
diff
changeset
|
1979 |
rev := currentClass binaryRevision. |
|
bb70a0f30e98
care for autoloaded classes when checking out
Claus Gittinger <cg@exept.de>
parents:
987
diff
changeset
|
1980 |
rev2 := currentClass revision. |
|
bb70a0f30e98
care for autoloaded classes when checking out
Claus Gittinger <cg@exept.de>
parents:
987
diff
changeset
|
1981 |
rev isNil ifTrue:[ |
|
bb70a0f30e98
care for autoloaded classes when checking out
Claus Gittinger <cg@exept.de>
parents:
987
diff
changeset
|
1982 |
rev := rev2 |
|
bb70a0f30e98
care for autoloaded classes when checking out
Claus Gittinger <cg@exept.de>
parents:
987
diff
changeset
|
1983 |
]. |
|
bb70a0f30e98
care for autoloaded classes when checking out
Claus Gittinger <cg@exept.de>
parents:
987
diff
changeset
|
1984 |
rev isNil ifTrue:[ |
| 1084 | 1985 |
pkg := currentClass package. |
|
2209
e3a4510c45f2
Project noProjectID -> PackageId noProjectID
Claus Gittinger <cg@exept.de>
parents:
2200
diff
changeset
|
1986 |
(pkg notNil and:[pkg ~= PackageId noProjectID]) ifTrue:[ |
| 1019 | 1987 |
containerModule := pkg upTo:$:. |
1988 |
containerPackage := pkg copyFrom:(containerModule size + 2). |
|
1989 |
]. |
|
1990 |
containerModule size == 0 ifTrue:[ |
|
| 2791 | 1991 |
containerModule := (self class lastModule ) ? Project current repositoryModule. |
| 1019 | 1992 |
]. |
1993 |
containerPackage size == 0 ifTrue:[ |
|
| 2791 | 1994 |
containerPackage := (self class lastPackage ) ? Project current package. |
| 1019 | 1995 |
]. |
| 1030 | 1996 |
answer := self confirmWithCancel:(resources |
| 1035 | 1997 |
string:'The class %3 seems to have no (valid) repository information.\\I assume you want to check it out from: %1/%2.' |
| 1030 | 1998 |
with:containerModule allBold |
| 1035 | 1999 |
with:containerPackage allBold |
| 1084 | 2000 |
with:currentClass name allBold) withCRs. |
| 1030 | 2001 |
answer isNil ifTrue:[^ self "cancelled"]. |
2002 |
answer ifFalse:[ |
|
| 2791 | 2003 |
rslt := self |
| 1030 | 2004 |
askForContainer:(resources string:'The class seems to have no repository information.\\Do you want to checkOut from an existing containers contents ?') |
2005 |
title:'Container to load from' note:nil |
|
2006 |
initialModule:containerModule |
|
2007 |
initialPackage:containerPackage |
|
| 1158 | 2008 |
initialFileName:(currentClass nameWithoutPrefix , '.st') |
| 1030 | 2009 |
forNewContainer:false. |
| 1084 | 2010 |
|
| 1030 | 2011 |
rslt isNil ifTrue:[ |
2012 |
"/ canel |
|
2013 |
^ self |
|
2014 |
]. |
|
2015 |
containerModule := "lastModule :=" rslt at:#module. |
|
2016 |
containerPackage := "lastPackage :=" rslt at:#package. |
|
2017 |
containerFile := rslt at:#fileName. |
|
2018 |
]. |
|
| 1019 | 2019 |
|
| 2791 | 2020 |
"/ rslt := self |
| 1019 | 2021 |
"/ askForContainer:(resources string:'The class seems to have no (valid) repository information.\\Do you want to check it out from an existing container ?') |
2022 |
"/ title:'Container to checkOut' note:nil |
|
2023 |
"/ initialModule:containerModule |
|
2024 |
"/ initialPackage:containerPackage |
|
2025 |
"/ initialFileName:(currentClass name , '.st'). |
|
| 1030 | 2026 |
"/ forNewContainer:false. |
| 1019 | 2027 |
"/ rslt isNil ifTrue:[^ self]. |
2028 |
"/ self warn:(resources string:'Class %1 seems to be not yet in the repository' with:currentClass name allBold). |
|
2029 |
"/ ^ self |
|
|
989
bb70a0f30e98
care for autoloaded classes when checking out
Claus Gittinger <cg@exept.de>
parents:
987
diff
changeset
|
2030 |
]. |
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2031 |
]. |
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2032 |
|
| 1966 | 2033 |
containerFile isNil ifTrue:[ |
2034 |
containerFile := currentClass classFilename. |
|
2035 |
]. |
|
2036 |
||
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2037 |
"/ |
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2038 |
"/ class in repository - ask for revision |
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2039 |
"/ |
| 1978 | 2040 |
containerModule isNil ifTrue:[ |
| 1982 | 2041 |
containerModule := Dialog request:(resources |
2042 |
stringWithCRs:'Missing Module Information for CheckOut of "%1".\\Module:' |
|
2043 |
with:aClass name allBold). |
|
| 1978 | 2044 |
containerModule isEmptyOrNil ifTrue:[^ self]. |
2045 |
]. |
|
2046 |
containerPackage isNil ifTrue:[ |
|
| 1982 | 2047 |
containerPackage := Dialog request:(resources |
2048 |
stringWithCRs:'Missing Package Information for CheckOut of "%1".\\Package:' |
|
2049 |
with:aClass name allBold). |
|
| 1978 | 2050 |
containerPackage isEmptyOrNil ifTrue:[^ self]. |
2051 |
]. |
|
2052 |
||
| 1084 | 2053 |
newestRev := mgr newestRevisionInFile:containerFile directory:containerPackage module:containerModule. |
| 1006 | 2054 |
askForRevision ifFalse:[ |
2055 |
rev := newestRev ? '' |
|
2056 |
] ifTrue:[ |
|
| 1019 | 2057 |
msg := resources string:'CheckOut which revision of ''%1'': (empty for newest)' with:nm allBold. |
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2058 |
rev notNil ifTrue:[ |
| 1006 | 2059 |
msg := msg , '\\' , (resources string:'Current ''%1'' is based upon rev %2.' |
| 1019 | 2060 |
with:nm allBold with:rev). |
| 1006 | 2061 |
(rev2 notNil and:[rev2 ~= rev]) ifTrue:[ |
|
2539
abce5c41eef8
comment/format in: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2522
diff
changeset
|
2062 |
msg := msg , '\' , (resources string:'And has been checked into the repository as %1.' with:rev2) |
| 1006 | 2063 |
] |
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2064 |
]. |
| 1006 | 2065 |
newestRev notNil ifTrue:[ |
|
2539
abce5c41eef8
comment/format in: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2522
diff
changeset
|
2066 |
msg := msg , '\' , (resources string:'Newest in repository is %1.' with:newestRev) |
|
989
bb70a0f30e98
care for autoloaded classes when checking out
Claus Gittinger <cg@exept.de>
parents:
987
diff
changeset
|
2067 |
]. |
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2068 |
|
| 2791 | 2069 |
rev := self |
| 1006 | 2070 |
askForExistingRevision:msg |
2071 |
title:'CheckOut from repository' |
|
2072 |
class:currentClass. |
|
2073 |
rev isNil ifTrue:[ |
|
| 1339 | 2074 |
^ self "/ canceled |
| 987 | 2075 |
]. |
| 1006 | 2076 |
]. |
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2077 |
|
| 1006 | 2078 |
rev withoutSpaces isEmpty ifTrue:[ |
2079 |
msg := 'extracting newest %1 (' , (newestRev ? '???') , ')'.
|
|
2080 |
"/ aStream := mgr getMostRecentSourceStreamForClassNamed:nm. |
|
2081 |
aStream := mgr getSourceStreamFor:currentClass revision:newestRev. |
|
2082 |
revString := '(newest: ' , (newestRev ? '???') , ')'. |
|
2083 |
] ifFalse:[ |
|
2084 |
msg := 'extracting previous %1'. |
|
| 1084 | 2085 |
"/ aStream := mgr getSourceStreamFor:currentClass revision:rev. |
2086 |
"/ revString := rev |
|
2087 |
aStream := mgr |
|
2088 |
streamForClass:currentClass |
|
2089 |
fileName:containerFile |
|
2090 |
revision:rev |
|
2091 |
directory:containerPackage |
|
2092 |
module:containerModule |
|
2093 |
cache:true. |
|
| 1006 | 2094 |
]. |
| 996 | 2095 |
|
| 1006 | 2096 |
aStream isNil ifTrue:[ |
|
1800
560e29381f52
ask for condense changeSet when loading the newest revision
Claus Gittinger <cg@exept.de>
parents:
1787
diff
changeset
|
2097 |
self warn:(resources string:'Could not extract source of %1 from repository' with:aClass name allBold). |
| 1006 | 2098 |
^ self |
2099 |
]. |
|
2100 |
aStream class readErrorSignal handle:[:ex | |
|
|
1800
560e29381f52
ask for condense changeSet when loading the newest revision
Claus Gittinger <cg@exept.de>
parents:
1787
diff
changeset
|
2101 |
self warn:('Read error while reading extracted source\\' , ex description) withCRs.
|
| 1006 | 2102 |
aStream close. |
2103 |
^ self |
|
2104 |
] do:[ |
|
2105 |
sourceToLoad := aStream contents asString. |
|
2106 |
]. |
|
2107 |
aStream close. |
|
| 987 | 2108 |
|
| 1919 | 2109 |
wasInChangeSetBefore := ChangeSet current includesChangeForClassOrMetaclass:currentClass. |
|
1879
3ca8838014ee
dont ask for changeSet-compression if the loaded
Claus Gittinger <cg@exept.de>
parents:
1877
diff
changeset
|
2110 |
|
| 1006 | 2111 |
currentClass isLoaded ifFalse:[ |
2112 |
rev = newestRev ifTrue:[ |
|
2113 |
currentClass autoload. |
|
| 996 | 2114 |
] ifFalse:[ |
| 1006 | 2115 |
sourceToLoad readStream fileIn. |
| 996 | 2116 |
]. |
|
1879
3ca8838014ee
dont ask for changeSet-compression if the loaded
Claus Gittinger <cg@exept.de>
parents:
1877
diff
changeset
|
2117 |
wasInChangeSetBefore ifFalse:[ |
|
3ca8838014ee
dont ask for changeSet-compression if the loaded
Claus Gittinger <cg@exept.de>
parents:
1877
diff
changeset
|
2118 |
ChangeSet current condenseChangesForClass:currentClass. |
|
3ca8838014ee
dont ask for changeSet-compression if the loaded
Claus Gittinger <cg@exept.de>
parents:
1877
diff
changeset
|
2119 |
]. |
| 1006 | 2120 |
^ self. |
2121 |
]. |
|
2122 |
||
| 2236 | 2123 |
inChangeSet := aClass hasUnsavedChanges. |
|
1800
560e29381f52
ask for condense changeSet when loading the newest revision
Claus Gittinger <cg@exept.de>
parents:
1787
diff
changeset
|
2124 |
|
|
1972
32853d3cb43a
care for errors during fileOut ofr local source
Claus Gittinger <cg@exept.de>
parents:
1971
diff
changeset
|
2125 |
Error handle:[:ex | |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2126 |
(Dialog |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2127 |
confirm:(resources |
|
2426
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2128 |
stringWithCRs:'An error:\ %1\was encountered while generating the current source of the class %2.\This might be due to some missing or corrupted source file.\You may proceed, but no information about the differences between your current version and the repositories version can be shown.\\Continue ?' |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2129 |
with:ex description |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2130 |
with:currentClass name allBold) |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2131 |
noLabel:'Cancel') |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2132 |
ifFalse:[ |
| 1999 | 2133 |
AbortOperationRequest raise |
|
1972
32853d3cb43a
care for errors during fileOut ofr local source
Claus Gittinger <cg@exept.de>
parents:
1971
diff
changeset
|
2134 |
]. |
|
2426
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2135 |
sourceToLoad readStream fileIn. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2136 |
^ self. |
|
1972
32853d3cb43a
care for errors during fileOut ofr local source
Claus Gittinger <cg@exept.de>
parents:
1971
diff
changeset
|
2137 |
] do:[ |
|
2426
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2138 |
self activityNotification:'generating current source...'. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2139 |
|
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2140 |
currentSource := self sourceCodeOfClass:currentClass. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2141 |
|
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2142 |
self activityNotification:'comparing...'. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2143 |
|
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2144 |
sourceToLoad = currentSource ifTrue:[ |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2145 |
"/ make all methods belong to the classes project |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2146 |
self setPackageOfAllMethodsIn:aClass to:aClass package. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2147 |
inChangeSet ifTrue:[ |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2148 |
rev = newestRev ifTrue:[ |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2149 |
(askForConfirmation not |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2150 |
or:[ wasInChangeSetBefore not |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2151 |
or:[ self confirm:(resources |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2152 |
stringWithCRs:'%1 is up-to-date.\\Remove entries for %1 from changeSet ?' |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2153 |
with:aClass name)]]) |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2154 |
ifTrue:[ |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2155 |
ChangeSet current condenseChangesForClass:aClass. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2156 |
]. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2157 |
]. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2158 |
]. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2159 |
self activityNotification:'... nothing changed in repository'. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2160 |
^ self. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2161 |
]. |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2162 |
|
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2163 |
self activityNotification:'generating diffSet...'. |
|
1972
32853d3cb43a
care for errors during fileOut ofr local source
Claus Gittinger <cg@exept.de>
parents:
1971
diff
changeset
|
2164 |
listHere := ChangeSet fromStream:(currentSource readStream). |
|
32853d3cb43a
care for errors during fileOut ofr local source
Claus Gittinger <cg@exept.de>
parents:
1971
diff
changeset
|
2165 |
]. |
|
2426
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2166 |
|
| 1006 | 2167 |
listRep := ChangeSet fromStream:(sourceToLoad readStream). |
| 1051 | 2168 |
|
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2169 |
Error handle:[:ex | |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2170 |
(Dialog |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2171 |
confirm:(resources |
|
2426
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2172 |
stringWithCRs:'An error:\ %1\was encountered while trying to figure out what has changed.\This might be due to some missing or corrupted source file.\If you proceed, the old code will be loaded over the existing code without further checks (fileIn).\\Continue ?' |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2173 |
with:ex description |
|
d698fb5ebbd7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2397
diff
changeset
|
2174 |
) |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2175 |
noLabel:'Cancel') |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2176 |
ifFalse:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2177 |
^ self |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2178 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2179 |
sourceToLoad readStream fileIn. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2180 |
^ self. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2181 |
] do:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2182 |
versionMethodsHere := listHere select:[:change | (change isMethodChange |
|
3354
d36778f0ff0b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3351
diff
changeset
|
2183 |
and:[((self sourceCodeManagerFor:aClass) "AbstractSourceCodeManager" isVersionMethodSelector:change selector) |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2184 |
and:[change changeClass isMeta]])]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2185 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2186 |
versionMethodsRep := listRep select:[:change | (change isMethodChange |
|
3354
d36778f0ff0b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3351
diff
changeset
|
2187 |
and:[((self sourceCodeManagerFor:aClass) "AbstractSourceCodeManager" isVersionMethodSelector:change selector) |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2188 |
and:[change changeClass isMeta]])]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2189 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2190 |
"/ compare all but the version methods |
| 3291 | 2191 |
listHere := listHere reject:[:change | (change isMethodChange |
|
2184
4bb6267612be
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
fm
parents:
2175
diff
changeset
|
2192 |
and:[(AbstractSourceCodeManager isVersionMethodSelector:change selector) |
| 3291 | 2193 |
and:[change changeClass isMeta]])]. |
2194 |
listRep := listRep reject:[:change | (change isMethodChange |
|
|
2184
4bb6267612be
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
fm
parents:
2175
diff
changeset
|
2195 |
and:[(AbstractSourceCodeManager isVersionMethodSelector:change selector) |
| 3291 | 2196 |
and:[change changeClass isMeta]])]. |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2197 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2198 |
diffSet := listHere diffSetsAgainst:listRep. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2199 |
changed := diffSet changed. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2200 |
onlyHere := diffSet onlyInReceiver. |
|
2794
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2201 |
|
|
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2202 |
"/ reject extensions |
|
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2203 |
onlyHere := onlyHere reject:[:eachDiff| |
| 4416 | 2204 |
|changeClass method methodsPackage| |
|
2794
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2205 |
|
|
3272
6ce72ad3d416
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3261
diff
changeset
|
2206 |
eachDiff isMethodChange |
| 4416 | 2207 |
and:[ (changeClass := eachDiff changeClass) notNil |
2208 |
and:[ (method := (changeClass compiledMethodAt:eachDiff selector)) notNil |
|
2209 |
and:[ (methodsPackage := method package) ~= changeClass package |
|
|
2794
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2210 |
and:[ methodsPackage ~= PackageId noProjectID ]]]] |
|
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2211 |
]. |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2212 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2213 |
onlyInRep := diffSet onlyInArg. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2214 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2215 |
changedClassDefinitions := changed select:[:eachChangePair | eachChangePair first isClassDefinitionChange]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2216 |
changed := changed reject:[:eachChangePair | eachChangePair first isClassDefinitionChange]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2217 |
changed := changed reject:[:eachChangePair | eachChangePair first isClassCommentChange]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2218 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2219 |
labels := #('Cancel' 'Merge' 'Load').
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2220 |
values := #(nil #merge #load). |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2221 |
default := askForRevision |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2222 |
ifTrue:[3. "i.e. load"] |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2223 |
ifFalse:[2. "i.e. merge"]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2224 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2225 |
msg := 'About to load ''%4''.\\'. |
| 4416 | 2226 |
onlyInRep notEmpty ifTrue:[ |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2227 |
msg := msg , 'The repositories version contains %1 method(s) which are not in your current class.\'. |
|
2064
3e7b6104ce47
When checking out newest sources from a repository,
Stefan Vogel <sv@exept.de>
parents:
2063
diff
changeset
|
2228 |
]. |
| 4416 | 2229 |
onlyHere notEmpty ifTrue:[ |
|
2794
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2230 |
msg := msg , (onlyInRep size > 0 ifTrue:['And there '] ifFalse:['There ']). |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2231 |
msg := msg , 'are %2 methods in your current class, which are not in the repository.\'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2232 |
]. |
| 4416 | 2233 |
changed notEmpty ifTrue:[ |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2234 |
changed size == 1 ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2235 |
msg := msg , 'The ''%6''-method is different (present in both).\\'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2236 |
singleChangeSelector := changed first first selector allBold |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2237 |
] ifFalse:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2238 |
msg := msg , '%3 methods are different (present in both).\\'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2239 |
] |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2240 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2241 |
changedClassDefinitions size > 0 ifTrue:[ |
|
2794
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2242 |
msg := msg , (changedClassDefinitions size == 1 |
|
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2243 |
ifTrue:['The class definition is different.\\'] |
|
77c62d93cc76
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2793
diff
changeset
|
2244 |
ifFalse:['%5 class definitions are different.\\']) |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2245 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2246 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2247 |
onlyHere isEmpty ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2248 |
onlyInRep isEmpty ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2249 |
(changed isEmpty and:[changedClassDefinitions isEmpty]) ifTrue:[ |
|
2605
93f1e7e8aee7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2602
diff
changeset
|
2250 |
versionMethodsRep notEmpty ifTrue:[ |
| 4329 | 2251 |
(answer := AlwaysUpdateVersionMethodsIfNoOtherChange) isNil ifTrue:[ |
2252 |
Dialog |
|
2253 |
withOptoutOption:[AlwaysUpdateVersionMethodsIfNoOtherChange := true] |
|
2254 |
labelled:'Do not ask again, but always update if no other change' |
|
2255 |
do:[ |
|
2256 |
answer := self confirm:(resources string:'Only version methods are different in %1.\\Update the version-IDs ?' with:aClass name allBold) withCRs. |
|
2257 |
] |
|
2258 |
]. |
|
2259 |
answer ifTrue:[ |
|
2260 |
Class withoutUpdatingChangesDo:[ |
|
2261 |
versionMethodsRep do:[:each | each apply]. |
|
2262 |
]. |
|
2263 |
]. |
|
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2264 |
]. |
| 2193 | 2265 |
"/ make all those methods belong to the classes project |
2266 |
"/ no - that is wrong !! self setPackageOfAllMethodsIn:aClass to:aClass package. |
|
2267 |
self setPackageOfAllMethodsInChangeSet:listRep to:aClass package. |
|
|
2605
93f1e7e8aee7
changed: #checkoutClass:askForRevision:askForMerge:askForConfirmation:
Claus Gittinger <cg@exept.de>
parents:
2602
diff
changeset
|
2268 |
self activityNotification:'Only version methods are different in the repository'. |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2269 |
^ self |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2270 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2271 |
inChangeSet ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2272 |
msg := msg , '\Attention:\Load will undo your changes made to ''%4'' (if any were made).'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2273 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2274 |
labels := #('Cancel' 'Load').
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2275 |
values := #(nil #load). |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2276 |
default := askForRevision |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2277 |
ifTrue:[2. "i.e. load"] |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2278 |
ifFalse:[1. "i.e. cancel"]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2279 |
default := 2. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2280 |
] ifFalse:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2281 |
changed isEmpty ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2282 |
msg := msg , '\Attention:\Load will load methods which are not present in ''%4''.'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2283 |
labels := #('Cancel' 'Load').
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2284 |
values := #(nil #load). |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2285 |
default := askForRevision |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2286 |
ifTrue:[2. "i.e. load"] |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2287 |
ifFalse:[1. "i.e. cancel"]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2288 |
default := 2. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2289 |
] ifFalse:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2290 |
inChangeSet ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2291 |
msg := msg , '\Attention:\Load will undo your changes made to ''%4'' (if any were made);'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2292 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2293 |
msg := msg , '\Merge will only load methods which are not present in ''%4'' (i.e. undo removals but preserve changes).'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2294 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2295 |
] |
| 1006 | 2296 |
] ifFalse:[ |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2297 |
onlyInRep isEmpty ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2298 |
inChangeSet ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2299 |
msg := msg , '\Attention:\Load will undo your changes made to ''%4'' (if any were made),'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2300 |
msg := msg , '\and remove added methods which are not present in the repository version.'. |
|
1055
f44b12442c58
version update after load from rep.
Claus Gittinger <cg@exept.de>
parents:
1054
diff
changeset
|
2301 |
]. |
| 1121 | 2302 |
labels := #('Cancel' 'Load').
|
| 987 | 2303 |
values := #(nil #load). |
|
1007
44c0229bcb43
better dialog message text and load/cancel default.
Claus Gittinger <cg@exept.de>
parents:
1006
diff
changeset
|
2304 |
default := askForRevision |
|
44c0229bcb43
better dialog message text and load/cancel default.
Claus Gittinger <cg@exept.de>
parents:
1006
diff
changeset
|
2305 |
ifTrue:[2. "i.e. load"] |
|
44c0229bcb43
better dialog message text and load/cancel default.
Claus Gittinger <cg@exept.de>
parents:
1006
diff
changeset
|
2306 |
ifFalse:[1. "i.e. cancel"]. |
| 1907 | 2307 |
default := 2. |
| 987 | 2308 |
] ifFalse:[ |
| 1339 | 2309 |
inChangeSet ifTrue:[ |
2310 |
msg := msg , '\Attention:\Load will undo your changes made to ''%4'' (if any were made);'. |
|
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2311 |
msg := msg , '\Merge will only load methods which are not present in ''%4'' (i.e. undo removals but preserve changes).'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2312 |
] |
| 1339 | 2313 |
] |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2314 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2315 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2316 |
msg := msg bindWith:onlyInRep size printString |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2317 |
with:onlyHere size printString |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2318 |
with:changed size printString |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2319 |
with:aClass name allBold |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2320 |
with:changedClassDefinitions size printString |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2321 |
with:singleChangeSelector. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2322 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2323 |
askForConfirmation ifFalse:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2324 |
answer := #load |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2325 |
] ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2326 |
answer := (Dialog confirmWithCancel:msg withCRs |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2327 |
labels:(resources array:labels) |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2328 |
values:values |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2329 |
default:default). |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2330 |
answer isNil ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2331 |
self activityNotification:'...cancelled'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2332 |
^ self |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2333 |
]. |
|
2013
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
2334 |
]. |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2335 |
self activityNotification:'updating...'. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2336 |
changedClasses := IdentitySet new. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2337 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2338 |
answer == #load ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2339 |
"when loading, remove all the methods which are no longer in classes with a changed |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2340 |
class definition. So we avoid possible compile errors of old methods, which will go away" |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2341 |
onlyHere do:[:eachChange | |
|
3272
6ce72ad3d416
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3261
diff
changeset
|
2342 |
"remove this change (method not present in repository version)" |
|
6ce72ad3d416
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3261
diff
changeset
|
2343 |
|cClass| |
|
6ce72ad3d416
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3261
diff
changeset
|
2344 |
eachChange isMethodChange ifTrue:[ |
|
6ce72ad3d416
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3261
diff
changeset
|
2345 |
cClass := eachChange changeClass. |
|
6ce72ad3d416
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3261
diff
changeset
|
2346 |
cClass notNil ifTrue:[ |
|
6ce72ad3d416
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3261
diff
changeset
|
2347 |
cClass basicRemoveSelector:eachChange selector |
|
6ce72ad3d416
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3261
diff
changeset
|
2348 |
]. |
|
6ce72ad3d416
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3261
diff
changeset
|
2349 |
] |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2350 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2351 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2352 |
changedClassDefinitions do:[:eachChangeArr | |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2353 |
|cHere eachChangedClass| |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2354 |
cHere := eachChangeArr at:1. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2355 |
eachChangedClass := cHere changeClass. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2356 |
eachChangedClass notNil ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2357 |
changedClasses add:eachChangedClass. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2358 |
eachChangedClass := eachChangedClass theNonMetaclass. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2359 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2360 |
"remove changed methods now, but keep the changes (to be applied later)" |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2361 |
changed do:[:eachChangeArr| |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2362 |
|eachChange eachClass| |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2363 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2364 |
eachChange := eachChangeArr first. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2365 |
eachChange isMethodChange ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2366 |
eachClass := eachChange changeClass. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2367 |
eachClass theNonMetaclass == eachChangedClass ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2368 |
eachClass basicRemoveSelector:eachChange selector. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2369 |
]. |
| 1999 | 2370 |
]. |
2371 |
]. |
|
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2372 |
] |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2373 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2374 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2375 |
"apply class definition changes (use the repository version)" |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2376 |
changedClassDefinitions do:[:eachChangeArr | |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2377 |
|cRep| |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2378 |
cRep := eachChangeArr at:2. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2379 |
cRep apply. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2380 |
]. |
|
1057
6903d4d5097d
do not update the changesFile, when checkingOut
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
2381 |
]. |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2382 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2383 |
onlyInRep do:[:eachChange | |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2384 |
|changeClass| |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2385 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2386 |
"apply this change (method only present in rep-version)" |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2387 |
eachChange apply. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2388 |
eachChange isMethodChange ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2389 |
changeClass := eachChange changeClass. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2390 |
changeClass notNil ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2391 |
eachChange changeMethod setPackage:(changeClass package). |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2392 |
changedClasses add:changeClass. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2393 |
] |
|
2013
0457926edfdb
allow checkout without popup confirmations
Michael Beyl <mb@exept.de>
parents:
2009
diff
changeset
|
2394 |
] |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2395 |
] |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2396 |
. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2397 |
answer == #load ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2398 |
changed do:[:eachChangeArr | "apply this change (go to rep-version)" |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2399 |
|cHere cRep| |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2400 |
cHere := eachChangeArr at:1. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2401 |
cRep := eachChangeArr at:2. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2402 |
cRep apply. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2403 |
cRep isMethodChange ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2404 |
cRep changeMethod setPackage:(cRep changeClass package). |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2405 |
changedClasses add:cRep changeClass. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2406 |
] |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2407 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2408 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2409 |
versionMethodsRep size >= 1 ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2410 |
versionMethodsRep last apply. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2411 |
] ifFalse:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2412 |
self error:'missing version method in repository' mayProceed:true. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2413 |
]. |
| 2193 | 2414 |
"/ make all those methods belong to the classes project |
2415 |
"/ no - that is wrong !! self setPackageOfAllMethodsIn:aClass to:aClass package. |
|
2416 |
self setPackageOfAllMethodsInChangeSet:listRep to:aClass package. |
|
|
1055
f44b12442c58
version update after load from rep.
Claus Gittinger <cg@exept.de>
parents:
1054
diff
changeset
|
2417 |
]. |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2418 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2419 |
answer == #load ifTrue:[ |
| 2236 | 2420 |
inChangeSet := aClass hasUnsavedChanges. |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2421 |
inChangeSet ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2422 |
rev = newestRev ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2423 |
(wasInChangeSetBefore not |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2424 |
or:[ self confirm:(resources |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2425 |
stringWithCRs:'%1 is now up-to-date.\\Remove entries for %1 from changeSet ?' |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2426 |
with:aClass name)]) |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2427 |
ifTrue:[ |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2428 |
ChangeSet current condenseChangesForClass:aClass. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2429 |
]. |
|
1800
560e29381f52
ask for condense changeSet when loading the newest revision
Claus Gittinger <cg@exept.de>
parents:
1787
diff
changeset
|
2430 |
]. |
|
560e29381f52
ask for condense changeSet when loading the newest revision
Claus Gittinger <cg@exept.de>
parents:
1787
diff
changeset
|
2431 |
]. |
|
560e29381f52
ask for condense changeSet when loading the newest revision
Claus Gittinger <cg@exept.de>
parents:
1787
diff
changeset
|
2432 |
]. |
|
2092
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2433 |
|
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2434 |
changedClasses do:[:eachClass | |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2435 |
eachClass changed:#projectOrganization. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2436 |
]. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2437 |
Smalltalk changed:#projectOrganization. |
|
cd9b53d5ca31
allow for fileIn, even if diffset generation failed
Claus Gittinger <cg@exept.de>
parents:
2064
diff
changeset
|
2438 |
self activityNotification:'... done'. |
|
1800
560e29381f52
ask for condense changeSet when loading the newest revision
Claus Gittinger <cg@exept.de>
parents:
1787
diff
changeset
|
2439 |
]. |
|
560e29381f52
ask for condense changeSet when loading the newest revision
Claus Gittinger <cg@exept.de>
parents:
1787
diff
changeset
|
2440 |
|
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
2441 |
"Modified: / 07-02-2001 / 18:18:32 / ps" |
|
3354
d36778f0ff0b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3351
diff
changeset
|
2442 |
"Modified: / 22-07-2013 / 13:17:32 / cg" |
| 4329 | 2443 |
"Modified: / 14-06-2018 / 17:02:05 / Claus Gittinger" |
| 4416 | 2444 |
"Modified: / 02-04-2019 / 12:03:11 / Stefan Vogel" |
|
986
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2445 |
! |
|
78d2a098bc81
support to checkout/merge a class from the repository
Claus Gittinger <cg@exept.de>
parents:
984
diff
changeset
|
2446 |
|
| 2691 | 2447 |
checkoutExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision askForMerge:askForMerge usingManager:aSourceCodeManager |
| 1522 | 2448 |
"check-out a class from the source repository. |
2449 |
If askForRevision is false, check-out the newest version." |
|
2450 |
||
| 3291 | 2451 |
|inChangeSet extensionMethods msg |
| 1704 | 2452 |
listHere listRep diffSet |
| 1522 | 2453 |
changed onlyHere onlyInRep answer labels values singleChangeSelector |
2454 |
changedClasses default | |
|
2455 |
||
| 2691 | 2456 |
listRep := self changeSetForExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision usingManager:aSourceCodeManager. |
|
1841
00e5a67d1d9e
refactored & created changeSetForExtensions-utility
Claus Gittinger <cg@exept.de>
parents:
1840
diff
changeset
|
2457 |
listRep isNil ifTrue:[ ^self ]. |
| 1522 | 2458 |
|
2459 |
self activityNotification:'generating diffSet...'. |
|
2460 |
||
2461 |
extensionMethods := OrderedCollection new. |
|
2462 |
Smalltalk allClassesDo:[:aClass | |owner classPackage| |
|
2463 |
"/ individual methods ... |
|
2464 |
aClass isMeta ifFalse:[ |
|
2465 |
(aClass package ~= packageToCheckOut) ifTrue:[ |
|
2466 |
aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | |
|
2467 |
"/ methods in this project ... |
|
2468 |
(mthd package = packageToCheckOut) ifTrue:[ |
|
2469 |
"/ ... whose class is not in the ckechIn-set |
|
2470 |
extensionMethods add:mthd |
|
2471 |
] |
|
2472 |
]. |
|
2473 |
]. |
|
2474 |
]. |
|
2475 |
]. |
|
2476 |
listHere := ChangeSet forExistingMethods:extensionMethods. |
|
2477 |
||
2478 |
inChangeSet := listRep contains:[:someChange | |
|
2479 |
|cClass cSel| |
|
2480 |
||
2481 |
someChange isMethodChange ifTrue:[ |
|
2482 |
cClass := someChange changeClass. |
|
2483 |
cSel := someChange selector. |
|
2484 |
ChangeSet current includesChangeForClass:cClass selector:cSel |
|
2485 |
] |
|
2486 |
]. |
|
2487 |
||
2488 |
diffSet := listHere diffSetsAgainst:listRep. |
|
2489 |
changed := diffSet changed. |
|
2490 |
onlyHere := diffSet onlyInReceiver. |
|
2491 |
onlyInRep := diffSet onlyInArg. |
|
2492 |
||
2493 |
labels := #('Cancel' 'Merge' 'Load').
|
|
2494 |
values := #(nil #merge #load). |
|
2495 |
default := askForRevision |
|
2496 |
ifTrue:[3. "i.e. load"] |
|
2497 |
ifFalse:[2. "i.e. merge"]. |
|
2498 |
||
2499 |
msg := 'About to load extensions for ''%5''.\\'. |
|
2500 |
onlyInRep size > 0 ifTrue:[ |
|
2501 |
msg := msg , 'The repositories version contains %1 extension method(s) which are not in your current image.\'. |
|
2502 |
]. |
|
2503 |
onlyHere size > 0 ifTrue:[ |
|
2504 |
onlyInRep size > 0 ifTrue:[ |
|
2505 |
msg := msg , 'And there '. |
|
2506 |
] ifFalse:[ |
|
2507 |
msg := msg , 'There '. |
|
2508 |
]. |
|
2509 |
msg := msg , 'are %2 extension methods in your current image, which are not in the repository.\'. |
|
2510 |
]. |
|
2511 |
changed size > 0 ifTrue:[ |
|
2512 |
changed size == 1 ifTrue:[ |
|
2513 |
msg := msg , 'The ''%5''-method is different (present in both).\\'. |
|
2514 |
singleChangeSelector := changed first first selector allBold |
|
2515 |
] ifFalse:[ |
|
2516 |
msg := msg , '%3 methods are different (present in both).\\'. |
|
2517 |
] |
|
2518 |
]. |
|
2519 |
||
2520 |
onlyHere isEmpty ifTrue:[ |
|
2521 |
onlyInRep isEmpty ifTrue:[ |
|
2522 |
(changed isEmpty) ifTrue:[ |
|
2523 |
listRep do:[:eachChange | |
|
2524 |
eachChange changeMethod setPackage:packageToCheckOut. |
|
2525 |
]. |
|
2526 |
^ self |
|
2527 |
]. |
|
2528 |
inChangeSet ifTrue:[ |
|
2529 |
msg := msg , '\Attention:\Load may undo any changes made to on of the extension methods (if any were made).'. |
|
2530 |
]. |
|
2531 |
labels := #('Cancel' 'Load').
|
|
2532 |
values := #(nil #load). |
|
2533 |
default := askForRevision |
|
2534 |
ifTrue:[2. "i.e. load"] |
|
2535 |
ifFalse:[1. "i.e. cancel"]. |
|
2536 |
] ifFalse:[ |
|
2537 |
changed isEmpty ifTrue:[ |
|
2538 |
msg := msg , '\Attention:\Load will load methods which are not present in the image.'. |
|
2539 |
labels := #('Cancel' 'Load').
|
|
2540 |
values := #(nil #load). |
|
2541 |
default := askForRevision |
|
2542 |
ifTrue:[2. "i.e. load"] |
|
2543 |
ifFalse:[1. "i.e. cancel"]. |
|
2544 |
] ifFalse:[ |
|
2545 |
inChangeSet ifTrue:[ |
|
2546 |
msg := msg , '\Attention:\Load will undo your changes made to the image (if any were made);'. |
|
2547 |
]. |
|
2548 |
msg := msg , '\Merge will only load methods which are not present in the image (i.e. undo removals but preserve changes).'. |
|
2549 |
]. |
|
2550 |
] |
|
2551 |
] ifFalse:[ |
|
2552 |
onlyInRep isEmpty ifTrue:[ |
|
2553 |
inChangeSet ifTrue:[ |
|
2554 |
msg := msg , '\Attention:\Load will undo your changes made to the image (if any were made),'. |
|
2555 |
msg := msg , '\and remove added methods which are not present in the repository version.'. |
|
2556 |
]. |
|
2557 |
labels := #('Cancel' 'Load').
|
|
2558 |
values := #(nil #load). |
|
2559 |
default := askForRevision |
|
2560 |
ifTrue:[2. "i.e. load"] |
|
2561 |
ifFalse:[1. "i.e. cancel"]. |
|
2562 |
] ifFalse:[ |
|
2563 |
inChangeSet ifTrue:[ |
|
2564 |
msg := msg , '\Attention:\Load will undo your changes made to the image (if any were made);'. |
|
2565 |
msg := msg , '\Merge will only load methods which are not present in the image (i.e. undo removals but preserve changes).'. |
|
2566 |
] |
|
2567 |
] |
|
2568 |
]. |
|
2569 |
||
2570 |
msg := msg bindWith:onlyInRep size printString |
|
2571 |
with:onlyHere size printString |
|
2572 |
with:changed size printString |
|
2573 |
with:singleChangeSelector |
|
2574 |
with:packageToCheckOut allBold. |
|
2575 |
||
2576 |
answer := (Dialog confirmWithCancel:msg withCRs |
|
2577 |
labels:(resources array:labels) |
|
2578 |
values:values |
|
2579 |
default:default). |
|
2580 |
answer isNil ifTrue:[^ self]. |
|
2581 |
||
2582 |
self activityNotification:'updating...'. |
|
2583 |
changedClasses := IdentitySet new. |
|
2584 |
||
2585 |
"/ Class withoutUpdatingChangesDo:[ |
|
2586 |
onlyInRep do:[:eachChange | "apply this change (method only present in rep-version)" |
|
2587 |
Class withoutUpdatingChangeSetDo:[ eachChange apply ]. |
|
2588 |
||
2589 |
eachChange changeMethod setPackage:packageToCheckOut. |
|
2590 |
changedClasses add:eachChange changeClass. |
|
2591 |
]. |
|
2592 |
answer == #load ifTrue:[ |
|
2593 |
onlyHere do:[:eachChange | "remove this change (method not present in rep-version)" |
|
2594 |
|cClass cSel| |
|
2595 |
||
2596 |
cClass := eachChange changeClass. |
|
2597 |
cSel := eachChange selector. |
|
2598 |
Class withoutUpdatingChangeSetDo:[ cClass removeSelector:cSel ]. |
|
2599 |
]. |
|
2600 |
changed do:[:eachChangeArr | "apply this change (go to rep-version)" |
|
2601 |
|cHere cRep| |
|
2602 |
cHere := eachChangeArr at:1. |
|
2603 |
cRep := eachChangeArr at:2. |
|
2604 |
Class withoutUpdatingChangeSetDo:[ cRep apply ]. |
|
2605 |
||
2606 |
cRep changeMethod setPackage:packageToCheckOut. |
|
2607 |
changedClasses add:cRep changeClass. |
|
2608 |
]. |
|
2609 |
]. |
|
2610 |
"/ ]. |
|
2611 |
changedClasses do:[:eachClass | |
|
2612 |
eachClass changed:#projectOrganization. |
|
2613 |
]. |
|
2614 |
Smalltalk changed:#projectOrganization. |
|
2615 |
||
2616 |
"Modified: / 07-02-2001 / 18:18:32 / ps" |
|
| 2691 | 2617 |
"Created: / 29-12-2011 / 14:34:12 / cg" |
| 1522 | 2618 |
! |
2619 |
||
| 957 | 2620 |
compareClassWithRepository:aClass |
2621 |
"open a diff-textView comparing the current (in-image) version |
|
2622 |
against its orgiginal version found in the repository." |
|
2623 |
||
|
1449
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2624 |
self compareClassWithRepository:aClass askForRevision:true |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2625 |
|
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2626 |
" |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2627 |
self compareClassWithRepository:Array |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2628 |
" |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2629 |
! |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2630 |
|
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2631 |
compareClassWithRepository:aClass askForRevision:askForRevision |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2632 |
"open a diff-textView comparing the current (in-image) version |
| 4320 | 2633 |
against the newest (askForRevision=false) |
2634 |
or an asked-for version (askForRevision=true) found in the repository." |
|
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2635 |
|
| 4255 | 2636 |
|classToCompare brwsr comparedSource currentSource rev revString thisRevString |
| 3953 | 2637 |
scmManager revisionInClass versionsAreTheSame revInfo revAuthor revDate revLabel | |
| 957 | 2638 |
|
|
1449
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2639 |
classToCompare := aClass theNonMetaclass. |
| 957 | 2640 |
|
| 4255 | 2641 |
comparedSource := self |
2642 |
fetchSourceOf:classToCompare askForRevision:askForRevision |
|
2643 |
into:[:revStringArg :revisionInClassArg :scmManagerArg| |
|
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2644 |
revString := revStringArg. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2645 |
revisionInClass := revisionInClassArg. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2646 |
scmManager := scmManagerArg. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2647 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2648 |
comparedSource isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2649 |
^ self |
| 957 | 2650 |
]. |
2651 |
||
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2652 |
"/ classToCompare := aClass theNonMetaclass. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2653 |
"/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2654 |
"/ nm := classToCompare name. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2655 |
"/ (mgr := manager) isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2656 |
"/ mgr := self sourceCodeManagerFor:classToCompare. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2657 |
"/ mgr isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2658 |
"/ self error:'oops - no sourcecode manager' mayProceed:true. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2659 |
"/ ^ self |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2660 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2661 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2662 |
"/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2663 |
"/ rev := classToCompare revisionInfoOfManager:mgr. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2664 |
"/"/ rev := classToCompare binaryRevision. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2665 |
"/ revisionInClass := classToCompare revisionOfManager:mgr. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2666 |
"/ rev isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2667 |
"/ rev := revisionInClass |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2668 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2669 |
"/ rev isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2670 |
"/ (Dialog confirm:'Class seems to be not yet in the repository (or classes revision info is missing or corrupted)\\Proceed ?' withCRs) |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2671 |
"/ ifFalse:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2672 |
"/ ^ self |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2673 |
"/ ] |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2674 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2675 |
"/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2676 |
"/ "/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2677 |
"/ "/ class in repository - ask for revision |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2678 |
"/ "/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2679 |
"/ SourceCodeManagerError handle:[:ex | |
| 4255 | 2680 |
"/ Dialog warn:(resources |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2681 |
"/ stringWithCRs:'Could not fetch revision info of "%1".\\Please check your sourcecode manager settings of %2 for package: "%3".\(and possibly the network for reachability of the repository)' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2682 |
"/ with:classToCompare name |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2683 |
"/ with:classToCompare sourceCodeManager managerTypeName |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2684 |
"/ with:classToCompare package). |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2685 |
"/ ^ self. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2686 |
"/ ] do:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2687 |
"/ newestRev := mgr newestRevisionOf:classToCompare. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2688 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2689 |
"/ askForRevision ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2690 |
"/ msg := resources string:'Compare to revision: (empty for newest)'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2691 |
"/ rev notNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2692 |
"/ msg := msg , '\\' , (resources string:'Current %1 is based upon rev %2.' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2693 |
"/ with:nm allBold with:rev). |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2694 |
"/ (revisionInClass notNil and:[revisionInClass ~= rev]) ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2695 |
"/ msg := msg , '\' , (resources string:'And has been checked into the repository as %1.' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2696 |
"/ with:revisionInClass) |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2697 |
"/ ] |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2698 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2699 |
"/ newestRev notNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2700 |
"/ msg := msg , '\' , (resources string:'Newest in repository is %1.' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2701 |
"/ with:newestRev) |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2702 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2703 |
"/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2704 |
"/ rev := self |
| 4255 | 2705 |
"/ askForExistingRevision:msg |
2706 |
"/ title:'Compare with repository' |
|
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2707 |
"/ class:classToCompare. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2708 |
"/ ] ifFalse:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2709 |
"/ rev := newestRev. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2710 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2711 |
"/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2712 |
"/ rev isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2713 |
"/ mgr = classToCompare sourceCodeManager ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2714 |
"/ msg := 'Could not figure out the newest revision of "%1".\\Please check if this class is really contained in that repository,\and also your sourcecode manager settings of %2 for package: "%3".\(and possibly the network for reachability of the repository)' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2715 |
"/ ] ifFalse:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2716 |
"/ msg := 'Could not figure out the newest revision of "%1".\\Notice that the class is actually maintained by %4, not %2.\Please check if this class is really in the %2 repository,\and also your sourcecode manager settings of %2 for package: "%3".\(and possibly the network for reachability of the repository)' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2717 |
"/ ]. |
| 4255 | 2718 |
"/ Dialog warn:(resources |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2719 |
"/ stringWithCRs:msg |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2720 |
"/ with:classToCompare name |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2721 |
"/ with:mgr managerTypeName |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2722 |
"/ with:classToCompare package |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2723 |
"/ with:(classToCompare sourceCodeManager managerTypeName)). |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2724 |
"/ ^ self. |
| 4255 | 2725 |
"/ |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2726 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2727 |
"/ rev withoutSpaces isEmpty ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2728 |
"/ msg := 'extracting newest %1 (' , (newestRev ? '???') , ')'.
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2729 |
"/ "/ aStream := mgr getMostRecentSourceStreamForClassNamed:nm. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2730 |
"/ aStream := mgr getSourceStreamFor:classToCompare revision:newestRev. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2731 |
"/ revString := '(newest: ' , (newestRev ? '???') , ')'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2732 |
"/ ] ifFalse:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2733 |
"/ msg := 'extracting previous %1'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2734 |
"/ aStream := mgr getSourceStreamFor:classToCompare revision:rev. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2735 |
"/ revString := rev |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2736 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2737 |
"/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2738 |
"/ aStream isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2739 |
"/ self warn:'Could not extract source from repository (check repository settings / network)'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2740 |
"/ ^ self |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2741 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2742 |
"/ aStream class readErrorSignal handle:[:ex | |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2743 |
"/ self warn:('Read error while reading extracted source\\' , ex description) withCRs.
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2744 |
"/ aStream close. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2745 |
"/ ^ self |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2746 |
"/ ] do:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2747 |
"/ comparedSource := aStream contents asString. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2748 |
"/ ]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2749 |
"/ aStream close. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2750 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2751 |
self activityNotification:'generating current source...'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2752 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2753 |
currentSource := self sourceCodeOfClass:classToCompare. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2754 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2755 |
self activityNotification:'comparing...'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2756 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2757 |
versionsAreTheSame := false. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2758 |
"/ a quick smoke test, if code is exactly the same |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2759 |
comparedSource = currentSource ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2760 |
versionsAreTheSame := true. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2761 |
] ifFalse:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2762 |
"/ this branch generates chunks and compares individual methods. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2763 |
"/ this is a litle more expensive, but will deal with reordered methods in the source, |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2764 |
"/ additional whitespace, empty lines etc. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2765 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2766 |
thisRevString := revisionInClass ? 'no revision'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2767 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2768 |
revString = '(newest)' ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2769 |
|newestRev| |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2770 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2771 |
(newestRev := scmManager newestRevisionOf:classToCompare) notNil ifTrue:[ |
| 3953 | 2772 |
revString := '(newest is ' , newestRev , ')'. |
2773 |
rev := newestRev. |
|
|
1449
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2774 |
] |
| 3953 | 2775 |
] ifFalse:[ |
2776 |
rev := revString |
|
2777 |
]. |
|
2778 |
||
2779 |
revLabel := revString. |
|
2780 |
||
2781 |
rev notNil ifTrue:[ |
|
2782 |
revInfo := scmManager revisionLogOf:classToCompare fromRevision:rev toRevision:rev. |
|
2783 |
revInfo notNil ifTrue:[ |
|
2784 |
revInfo := (revInfo at:#revisions) first. |
|
2785 |
revAuthor := revInfo at:#author ifAbsent:[nil]. |
|
2786 |
revDate := revInfo at:#date ifAbsent:[nil]. |
|
| 3993 | 2787 |
revDate isString ifTrue:[ |
| 3953 | 2788 |
revDate := Timestamp readFrom:revDate onError:nil. |
2789 |
]. |
|
2790 |
revLabel := revString , ' ('.
|
|
2791 |
revDate notNil ifTrue:[ |
|
2792 |
revLabel := revLabel , revDate asDate printString. |
|
2793 |
]. |
|
2794 |
revLabel := revLabel , ' by ', revAuthor. |
|
2795 |
revLabel := revLabel , ')'. |
|
2796 |
]. |
|
|
1449
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2797 |
]. |
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2798 |
|
|
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2799 |
self activityNotification:'comparing...'. |
| 957 | 2800 |
|
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2801 |
ChangeSet invalidChangeChunkError handle:[:ex | |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2802 |
|answer| |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2803 |
|
| 4255 | 2804 |
answer := Dialog |
2805 |
confirm:(resources |
|
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2806 |
stringWithCRs:'An invalid change chunk was encountered when reading the source of %1.\This may be due to a currupted source file (or source file was modified/updated in the meantime, without recompilation).\\Proceed in debugger?' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2807 |
with:aClass) |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2808 |
yesLabel:(resources string:'Debug') |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2809 |
noLabel:(resources string:'Cancel') |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2810 |
initialAnswer:false. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2811 |
answer ifTrue:[ex reject]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2812 |
AbortOperationRequest raise. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2813 |
] do:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2814 |
brwsr := (UserPreferences versionDiffViewerClass) |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2815 |
openOnClass:classToCompare |
| 3953 | 2816 |
labelA:('Repository: ' , revLabel)
|
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2817 |
sourceA:comparedSource |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2818 |
labelB:('Current: (based on: ' , thisRevString , ')')
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2819 |
sourceB:currentSource |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2820 |
title:('Comparing ' , classToCompare name)
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2821 |
ifSame:[versionsAreTheSame := true]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2822 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2823 |
versionsAreTheSame ifFalse:[ |
| 4255 | 2824 |
brwsr classChangeSet |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2825 |
classBeingCompared:classToCompare; |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2826 |
versionA:revString; |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2827 |
versionB:thisRevString , 'mod'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2828 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2829 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2830 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2831 |
versionsAreTheSame ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2832 |
(classToCompare hasUnsavedChanges) ifTrue:[ |
| 4448 | 2833 |
|answer| |
2834 |
||
2835 |
DoNotAskForCondenseIfSameAsRepository == true ifTrue:[ |
|
2836 |
answer := true. |
|
2837 |
] ifFalse:[ |
|
2838 |
Dialog |
|
2839 |
withOptoutOption:[ DoNotAskForCondenseIfSameAsRepository := true ] |
|
2840 |
labelled:'Do not ask again' |
|
2841 |
do:[ |
|
2842 |
answer :=self confirm:(resources |
|
2843 |
stringWithCRs:'Versions of %1 are identical.\\Remove entries from changeSet ?' |
|
2844 |
with:classToCompare name allBold) |
|
2845 |
]. |
|
2846 |
]. |
|
2847 |
answer ifTrue:[ |
|
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2848 |
ChangeSet current condenseChangesForClass:classToCompare. |
| 4448 | 2849 |
] |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2850 |
] ifFalse:[ |
| 4255 | 2851 |
self information:(resources string:'Versions are identical.'). |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2852 |
ChangeSet current unrememberChangedClasses. |
|
1449
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2853 |
]. |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2854 |
revisionInClass isNil ifTrue:[ |
| 4486 | 2855 |
(Dialog confirm:'Update (Fix) the classes Revision Info ?') |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2856 |
ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2857 |
|newString root| |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2858 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2859 |
newString := scmManager updatedRevisionStringOf:aClass forRevision:rev with:aClass revisionString. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2860 |
newString isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2861 |
root := scmManager getCVSROOTForModule:(aClass package upTo:$:). |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2862 |
root := scmManager repositoryTopDirectoryFromCVSRoot:root. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2863 |
newString := '$', 'Header: ',(root copyReplaceAll: $: with:$/ ),'/' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2864 |
,(Smalltalk fileNameForClass:aClass),'.st,v ',rev,' ' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2865 |
,(Date today printStringFormat:'%y-%m-%d'),' ' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2866 |
,(Time now printStringFormat:'%h:%m:%s'),' ' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2867 |
,'+0000 ' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2868 |
,(OperatingSystem getLoginName),' Exp $'. |
|
1449
cfb2e98b9259
refactored (code duplication)
Claus Gittinger <cg@exept.de>
parents:
1433
diff
changeset
|
2869 |
]. |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2870 |
scmManager updateVersionMethodOf:aClass for:newString. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
2871 |
] |
| 957 | 2872 |
]. |
2873 |
]. |
|
2874 |
||
2875 |
" |
|
| 997 | 2876 |
self compareClassWithRepository:Array |
| 957 | 2877 |
" |
| 1497 | 2878 |
|
| 2847 | 2879 |
"Modified: / 24-07-2012 / 18:11:27 / cg" |
| 4255 | 2880 |
"Modified (comment): / 04-09-2017 / 17:37:24 / mawalch" |
| 4448 | 2881 |
"Modified: / 23-06-2019 / 18:48:32 / Claus Gittinger" |
| 957 | 2882 |
! |
2883 |
||
| 4201 | 2884 |
comparePackages:packages askForRevision:askForRevision |
|
3536
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2885 |
"Compares code of given packages (loaded in the image) against a specific revision |
|
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2886 |
and opens a diff browser on differences. |
| 4201 | 2887 |
|
2888 |
If `askForRevision` is true, then user is asked to specify to which revision to |
|
2889 |
update. If `askForRevision` is false, then packages are updated to a 'newest' |
|
2890 |
revision. |
|
2891 |
||
2892 |
NOTE: Definition of `newest` revision may vary. For SCMs which allows for multiple |
|
2893 |
heads, it is not clear which one it is. In that case, even if `askForRevision` is |
|
2894 |
false, this method may result in user interaction, asking user to select which of the |
|
2895 |
newest she wants." |
|
2896 |
||
2897 |
self comparePackages:packages askForRevision:askForRevision extensionsOnly:false |
|
2898 |
||
2899 |
"Created: / 04-04-2014 / 15:29:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2900 |
! |
|
2901 |
||
2902 |
comparePackages:packages askForRevision:askForRevision extensionsOnly:extensionsOnly |
|
2903 |
"Compares code of given packages (loaded in the image) against a specific revision |
|
2904 |
and opens a diff browser on differences. |
|
2905 |
||
|
3536
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2906 |
If `askForRevision` is true, then user is asked to specify to which revision to |
|
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2907 |
update. If `askForRevision` is false, then packages are updated to a 'newest' |
| 4201 | 2908 |
revision. |
2909 |
||
|
3536
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2910 |
NOTE: Definition of `newest` revision may vary. For SCMs which allows for multiple |
|
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2911 |
heads, it is not clear which one it is. In that case, even if `askForRevision` is |
| 4201 | 2912 |
false, this method may result in user interaction, asking user to select which of the |
|
3536
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2913 |
newest she wants." |
|
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2914 |
|
| 4201 | 2915 |
|string dateOrNil symbolicNameOrNil knownTags includeSubProjectsHolder |
2916 |
packagesIn packagesCompared| |
|
2917 |
||
2918 |
packagesIn := packages value. |
|
2919 |
||
2920 |
knownTags := self knownTagsInPackages:packagesIn. |
|
2921 |
||
2922 |
includeSubProjectsHolder := true asValue. |
|
2923 |
string := self |
|
2924 |
askForPackageVersion:'Compare with version from date (%1) or tag (any other format) (empty for newest):' |
|
2925 |
with:includeSubProjectsHolder |
|
2926 |
knownTags:knownTags |
|
2927 |
into:[:dateOrNilArg :symbolicNameOrNilArg | |
|
2928 |
dateOrNil := dateOrNilArg. |
|
2929 |
symbolicNameOrNil := symbolicNameOrNilArg. |
|
2930 |
||
2931 |
LastComparedTag := symbolicNameOrNil. |
|
2932 |
]. |
|
2933 |
||
2934 |
string isNil ifTrue:[^ self]. |
|
2935 |
||
2936 |
packagesCompared := packagesIn. |
|
2937 |
includeSubProjectsHolder value ifTrue:[ |
|
2938 |
packagesCompared := Smalltalk allPackageIDs |
|
2939 |
select:[:eachPackage | |
|
2940 |
packagesIn contains:[:p | |
|
2941 |
eachPackage = p |
|
2942 |
or:[ (eachPackage startsWith:(p,'-')) |
|
2943 |
or:[ (eachPackage startsWith:(p,':')) ]] |
|
2944 |
] |
|
2945 |
] |
|
2946 |
]. |
|
2947 |
||
2948 |
packagesCompared value do:[:eachProject | |
|
2949 |
dateOrNil notNil ifTrue:[ |
|
2950 |
self compareProject:eachProject withRepositoryVersionFrom:dateOrNil extensionsOnly:extensionsOnly |
|
2951 |
] ifFalse:[ |
|
2952 |
self compareProject:eachProject withRepositoryVersionTaggedAs:symbolicNameOrNil extensionsOnly:extensionsOnly |
|
2953 |
] |
|
2954 |
]. |
|
2955 |
||
2956 |
"Created: / 04-04-2014 / 15:29:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2957 |
"Modified: / 05-02-2017 / 04:24:39 / cg" |
|
2958 |
! |
|
2959 |
||
2960 |
compareProject:aProject |
|
2961 |
repositoryVersionFrom:dateOrNilV1 orTag:symbolicNameOrNilV1 |
|
2962 |
againstRepositoryVersionFrom:dateOrNilV2 orTag:symbolicNameOrNilV2 |
|
2963 |
extensionsOnly:extensionsOnly |
|
2964 |
||
2965 |
|diffSet| |
|
2966 |
||
2967 |
diffSet := self |
|
2968 |
diffSetOfProject:aProject |
|
2969 |
repositoryVersionFrom:dateOrNilV1 orTag:symbolicNameOrNilV1 |
|
2970 |
againstRepositoryVersionFrom:dateOrNilV2 orTag:symbolicNameOrNilV2 |
|
2971 |
extensionsOnly:extensionsOnly. |
|
2972 |
VersionDiffBrowser |
|
2973 |
openOnDiffSet:diffSet |
|
2974 |
labelA:(dateOrNilV1 ? symbolicNameOrNilV1) |
|
2975 |
labelB:(dateOrNilV2 ? symbolicNameOrNilV2) |
|
2976 |
title:('Differences of %1' bindWith:aProject)
|
|
2977 |
ignoreExtensions:true |
|
2978 |
ignoreVersionMethods:true. |
|
2979 |
||
2980 |
"Created: / 05-02-2017 / 04:21:15 / cg" |
|
|
3536
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2981 |
! |
|
cb8679184d3b
Compare packages functionality moved from browser to SourceCoeManagerUtilities
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3534
diff
changeset
|
2982 |
|
| 2189 | 2983 |
compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest |
| 3926 | 2984 |
^ self compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:false |
2985 |
! |
|
2986 |
||
2987 |
compareProject:aProject withRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:extensionsOnly |
|
| 2189 | 2988 |
|diffSet| |
2989 |
||
| 3926 | 2990 |
diffSet := self diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:extensionsOnly. |
|
1875
f00eb53229ae
first attempt with compare-project functionality
Claus Gittinger <cg@exept.de>
parents:
1864
diff
changeset
|
2991 |
VersionDiffBrowser |
|
f00eb53229ae
first attempt with compare-project functionality
Claus Gittinger <cg@exept.de>
parents:
1864
diff
changeset
|
2992 |
openOnDiffSet:diffSet |
|
f00eb53229ae
first attempt with compare-project functionality
Claus Gittinger <cg@exept.de>
parents:
1864
diff
changeset
|
2993 |
labelA:'Repository' |
|
f00eb53229ae
first attempt with compare-project functionality
Claus Gittinger <cg@exept.de>
parents:
1864
diff
changeset
|
2994 |
labelB:'Image' |
|
2522
d32ade066c3f
changed: #compareProject:withRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2487
diff
changeset
|
2995 |
title:('Differences of %1' bindWith:aProject)
|
| 2949 | 2996 |
ignoreExtensions:true |
2997 |
ignoreVersionMethods:true. |
|
|
2522
d32ade066c3f
changed: #compareProject:withRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2487
diff
changeset
|
2998 |
|
|
d32ade066c3f
changed: #compareProject:withRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2487
diff
changeset
|
2999 |
"Modified: / 12-09-2011 / 11:56:01 / cg" |
| 2189 | 3000 |
! |
3001 |
||
| 2939 | 3002 |
compareProject:aProject withRepositoryVersionTaggedAs:aSymbolicName |
3003 |
|diffSet| |
|
3004 |
||
3005 |
diffSet := self diffSetOfProject:aProject againstRepositoryVersionTaggedAs:aSymbolicName. |
|
3006 |
VersionDiffBrowser |
|
3007 |
openOnDiffSet:diffSet |
|
| 3926 | 3008 |
labelA:'Repository ("',(aSymbolicName?'newest'),'")'
|
| 2939 | 3009 |
labelB:'Image' |
3010 |
title:('Differences of %1' bindWith:aProject)
|
|
| 2949 | 3011 |
ignoreExtensions:true |
3012 |
ignoreVersionMethods:true. |
|
| 2939 | 3013 |
|
3014 |
"Modified: / 12-09-2011 / 11:56:01 / cg" |
|
| 4201 | 3015 |
"Modified (format): / 04-02-2017 / 18:54:02 / cg" |
| 2939 | 3016 |
! |
3017 |
||
| 4201 | 3018 |
compareProject:aProject withRepositoryVersionTaggedAs:aTagOrNil extensionsOnly:extensionsOnly |
3019 |
"if aTagOrNil is nil, compare against the newest version in the repositry" |
|
3020 |
||
| 4132 | 3021 |
|diffSet| |
3022 |
||
| 4201 | 3023 |
diffSet := self diffSetOfProject:aProject againstRepositoryVersionTaggedAs:aTagOrNil extensionsOnly:extensionsOnly. |
| 4132 | 3024 |
VersionDiffBrowser |
3025 |
openOnDiffSet:diffSet |
|
3026 |
labelA:'Repository' |
|
3027 |
labelB:'Image' |
|
3028 |
title:('Differences of %1' bindWith:aProject)
|
|
3029 |
ignoreExtensions:true |
|
3030 |
ignoreVersionMethods:true. |
|
3031 |
||
| 4201 | 3032 |
|
3033 |
" |
|
3034 |
CVSSourceCodeManager utilities |
|
3035 |
compareProject:'stx:libbasic2' |
|
3036 |
withRepositoryVersionTaggedAs:nil |
|
3037 |
extensionsOnly:false. |
|
3038 |
||
3039 |
CVSSourceCodeManager utilities |
|
3040 |
compareProject:'stx:libbasic2' |
|
3041 |
withRepositoryVersionTaggedAs:'expecco_2_10_0' |
|
3042 |
extensionsOnly:false. |
|
3043 |
" |
|
3044 |
||
| 4132 | 3045 |
"Created: / 12-11-2016 / 03:39:48 / cg" |
| 4201 | 3046 |
"Modified (comment): / 04-02-2017 / 18:46:49 / cg" |
| 4132 | 3047 |
! |
3048 |
||
| 2189 | 3049 |
compareProjectWithRepository:aProject |
3050 |
^ self compareProject:aProject withRepositoryVersionFrom:nil |
|
|
1875
f00eb53229ae
first attempt with compare-project functionality
Claus Gittinger <cg@exept.de>
parents:
1864
diff
changeset
|
3051 |
! |
|
f00eb53229ae
first attempt with compare-project functionality
Claus Gittinger <cg@exept.de>
parents:
1864
diff
changeset
|
3052 |
|
| 4201 | 3053 |
compareTwoPackageVersions:packages |
3054 |
"Compares two versions of given packages." |
|
3055 |
||
3056 |
self compareTwoPackageVersions:packages extensionsOnly:false |
|
3057 |
||
3058 |
"Created: / 04-02-2017 / 17:33:02 / cg" |
|
3059 |
! |
|
3060 |
||
3061 |
compareTwoPackageVersions:packagesIn extensionsOnly:extensionsOnly |
|
3062 |
"Compares two versions of given packages |
|
3063 |
and opens a diff browser on differences." |
|
3064 |
||
3065 |
|string includeSubProjectsHolder knownTags |
|
3066 |
dateOrNilV1 dateOrNilV2 |
|
3067 |
symbolicNameOrNilV1 symbolicNameOrNilV2 |
|
3068 |
packagesCompared| |
|
3069 |
||
3070 |
knownTags := self knownTagsInPackages:packagesIn first. |
|
3071 |
includeSubProjectsHolder := true asValue. |
|
3072 |
||
3073 |
string := self |
|
3074 |
askForPackageVersion:'First version''s date (%1) or tag (any other format):' |
|
3075 |
with:includeSubProjectsHolder |
|
3076 |
knownTags:knownTags |
|
3077 |
into:[:dateOrNilArg :symbolicNameOrNilArg | |
|
3078 |
dateOrNilV1 := dateOrNilArg. |
|
3079 |
symbolicNameOrNilV1 := symbolicNameOrNilArg. |
|
3080 |
]. |
|
3081 |
string isNil ifTrue:[^ self]. |
|
3082 |
||
3083 |
string := self |
|
3084 |
askForPackageVersion:'Second version''s date (%1) or tag (any other format):' |
|
3085 |
with:nil |
|
3086 |
knownTags:knownTags |
|
3087 |
into:[:dateOrNilArg :symbolicNameOrNilArg | |
|
3088 |
dateOrNilV2 := dateOrNilArg. |
|
3089 |
symbolicNameOrNilV2 := symbolicNameOrNilArg. |
|
3090 |
]. |
|
3091 |
string isNil ifTrue:[^ self]. |
|
3092 |
||
3093 |
LastComparedTag := symbolicNameOrNilV1. |
|
3094 |
||
3095 |
packagesCompared := packagesIn. |
|
3096 |
includeSubProjectsHolder value ifTrue:[ |
|
3097 |
packagesCompared := |
|
3098 |
Smalltalk allPackageIDs |
|
3099 |
select:[:eachPackage | |
|
3100 |
packagesIn contains:[:p | |
|
3101 |
eachPackage = p |
|
3102 |
or:[ (eachPackage startsWith:(p,'-')) |
|
3103 |
or:[ (eachPackage startsWith:(p,':')) ]] |
|
3104 |
] |
|
3105 |
] |
|
3106 |
]. |
|
3107 |
||
3108 |
packagesCompared value do:[:eachProject | |
|
3109 |
self |
|
3110 |
compareProject:eachProject |
|
3111 |
repositoryVersionFrom:dateOrNilV1 orTag:symbolicNameOrNilV1 |
|
3112 |
againstRepositoryVersionFrom:dateOrNilV2 orTag:symbolicNameOrNilV2 |
|
3113 |
extensionsOnly:extensionsOnly |
|
3114 |
]. |
|
3115 |
||
3116 |
" |
|
3117 |
CVSSourceCodeManager utilities |
|
3118 |
compareTwoPackageVersions:#('stx:libbasic') extensionsOnly:true
|
|
3119 |
" |
|
3120 |
||
3121 |
"Created: / 04-02-2017 / 17:51:09 / cg" |
|
3122 |
"Modified: / 05-02-2017 / 04:23:07 / cg" |
|
3123 |
! |
|
3124 |
||
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3125 |
createSourceContainerForClass:aClass |
| 2651 | 3126 |
"let user specify the source-repository values for aClass. |
3127 |
Return false, if failed." |
|
3128 |
||
3129 |
^ self |
|
3130 |
createSourceContainerForClass:aClass |
|
3131 |
usingManager:(self sourceCodeManagerFor:aClass). |
|
3132 |
||
3133 |
"Modified: / 21-12-2011 / 18:31:49 / cg" |
|
3134 |
! |
|
3135 |
||
3136 |
createSourceContainerForClass:aClass usingManager:aManager |
|
3137 |
"let user specify the source-repository values for aClass. |
|
3138 |
Return false, if failed." |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3139 |
|
| 3992 | 3140 |
^ self |
3141 |
createSourceContainerForClass:aClass usingManager:aManager |
|
3142 |
confirmNewContainer:confirmNewFiles |
|
3143 |
! |
|
3144 |
||
3145 |
createSourceContainerForClass:aClass usingManager:aManager confirmNewContainer:confirmNewContainer |
|
3146 |
"let user specify the source-repository values for aClass. |
|
3147 |
Return false, if failed." |
|
3148 |
||
| 2651 | 3149 |
aManager isNil ifTrue:[^ false]. |
3150 |
||
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3151 |
^ self |
| 2651 | 3152 |
defineSourceContainerForClass:aClass |
3153 |
usingManager:aManager |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3154 |
title:(resources string:'Repository information for %1' with:aClass name) |
| 2651 | 3155 |
text:(resources string:'Create new %1-repository container for ''%2''' |
3156 |
with:aManager managerTypeName |
|
3157 |
with:aClass name allBold) |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3158 |
createDirectories:true |
| 3992 | 3159 |
createContainer:true |
3160 |
confirmNewContainer:confirmNewContainer. |
|
| 2651 | 3161 |
|
3162 |
"Created: / 21-12-2011 / 18:31:23 / cg" |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3163 |
! |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3164 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3165 |
defineSourceContainerForClass:aClass title:title text:boxText createDirectories:createDirs createContainer:createContainer |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3166 |
"let user specify the source-repository values for aClass" |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3167 |
|
| 2651 | 3168 |
^ self |
3169 |
defineSourceContainerForClass:aClass |
|
3170 |
usingManager:(self sourceCodeManagerFor:aClass) |
|
3171 |
title:title |
|
3172 |
text:boxText |
|
3173 |
createDirectories:createDirs |
|
3174 |
createContainer:createContainer |
|
3175 |
||
3176 |
"Modified: / 21-12-2011 / 18:34:44 / cg" |
|
3177 |
! |
|
3178 |
||
3179 |
defineSourceContainerForClass:aClass usingManager:mgr title:title text:boxText createDirectories:createDirs createContainer:createContainer |
|
3180 |
"let user specify the source-repository values for aClass" |
|
3181 |
||
| 3992 | 3182 |
^ self |
3183 |
defineSourceContainerForClass:aClass usingManager:mgr title:title text:boxText |
|
3184 |
createDirectories:createDirs createContainer:createContainer |
|
3185 |
confirmNewContainer:confirmNewFiles |
|
3186 |
! |
|
3187 |
||
3188 |
defineSourceContainerForClass:aClass usingManager:mgr title:title text:boxText |
|
3189 |
createDirectories:createDirs createContainer:createContainer |
|
3190 |
confirmNewContainer:confirmNewContainer |
|
3191 |
"let user specify the source-repository values for aClass" |
|
3192 |
||
| 2651 | 3193 |
|className |
| 2063 | 3194 |
"oldModule oldPackage" oldFileName |
| 1533 | 3195 |
module directory fileName nameSpace nameSpacePrefix |
| 2651 | 3196 |
info project nm creatingNew msg |
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3197 |
answer doCheckinWithoutAsking forceCheckIn rslt note |
|
3276
e6902cec8b2f
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3272
diff
changeset
|
3198 |
requiredPackage classPackage| |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3199 |
|
| 2651 | 3200 |
mgr isNil ifTrue:[^ false]. |
3201 |
||
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3202 |
aClass isLoaded ifFalse:[ |
| 1076 | 3203 |
self warn:(resources string:'Please load the %1-class first' with:aClass name). |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3204 |
^ false. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3205 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3206 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3207 |
className := aClass name. |
|
3276
e6902cec8b2f
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3272
diff
changeset
|
3208 |
classPackage := aClass package. |
|
e6902cec8b2f
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3272
diff
changeset
|
3209 |
classPackage ~= PackageId noProjectID ifTrue:[ |
|
e6902cec8b2f
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3272
diff
changeset
|
3210 |
module := classPackage asPackageId module. |
|
e6902cec8b2f
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3272
diff
changeset
|
3211 |
directory := classPackage asPackageId directory. |
| 1533 | 3212 |
] ifFalse:[ |
3213 |
"/ |
|
3214 |
"/ defaults, if nothing at all is known |
|
3215 |
"/ |
|
3216 |
(module := LastModule) isNil ifTrue:[ |
|
| 3919 | 3217 |
module := (UserPreferences current usersModuleName "OperatingSystem getLoginName"). |
| 1533 | 3218 |
]. |
3219 |
(directory := LastPackage) isNil ifTrue:[ |
|
3220 |
directory := 'private'. |
|
|
3153
c2bca6dbe3a7
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3146
diff
changeset
|
3221 |
]. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3222 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3223 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3224 |
"/ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3225 |
"/ try to extract some useful defaults from the current project |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3226 |
"/ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3227 |
(Project notNil and:[(project := Project current) notNil]) ifTrue:[ |
| 1533 | 3228 |
directory isNil ifTrue:[ |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3229 |
(nm := project repositoryDirectory) isNil ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3230 |
nm := project name |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3231 |
]. |
| 1533 | 3232 |
directory := nm. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3233 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3234 |
module isNil ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3235 |
(nm := project repositoryModule) notNil ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3236 |
module := nm |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3237 |
] |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3238 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3239 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3240 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3241 |
"/ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3242 |
"/ ask the sourceCodeManager if it knows anything about that class |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3243 |
"/ if so, take that as a default. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3244 |
"/ |
|
1189
fdc5e747c184
refactored check for a valid sourceCodeManager into one place
Claus Gittinger <cg@exept.de>
parents:
1185
diff
changeset
|
3245 |
info := mgr sourceInfoOfClass:aClass. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3246 |
info notNil ifTrue:[ |
| 1368 | 3247 |
true "module ~= LastModule" ifTrue:[ |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3248 |
(info includesKey:#module) ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3249 |
module := (info at:#module). |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3250 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3251 |
]. |
| 1401 | 3252 |
"/ true "package ~= LastPackage" ifTrue:[ |
3253 |
"/ (info includesKey:#directory) ifTrue:[ |
|
3254 |
"/ package := (info at:#directory). |
|
3255 |
"/ ]. |
|
3256 |
"/ ]. |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3257 |
fileName := mgr containerFromSourceInfo:info. |
| 4007 | 3258 |
fileName isNil ifTrue:[ fileName := aClass classFilename ]. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3259 |
(nameSpace := aClass nameSpace) ~~ Smalltalk ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3260 |
nameSpacePrefix := nameSpace name , '::'. |
| 3259 | 3261 |
fileName := fileName withoutPrefix:nameSpacePrefix. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3262 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3263 |
"/ (info includesKey:#fileName) ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3264 |
"/ fileName := (info at:#fileName). |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3265 |
"/ ] ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3266 |
"/ (info includesKey:#expectedFileName) ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3267 |
"/ fileName := (info at:#expectedFileName). |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3268 |
"/ ] ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3269 |
"/ (info includesKey:#classFileNameBase) ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3270 |
"/ fileName := (info at:#classFileNameBase) , '.st'. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3271 |
"/ ] |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3272 |
"/ ] |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3273 |
"/ ] |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3274 |
]. |
| 4058 | 3275 |
directory isNil ifTrue:[ |
3276 |
Dialog information:('Using %1 as last package-folder' bindWith:LastPackage).
|
|
|
3514
a35b833ed992
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3433
diff
changeset
|
3277 |
directory := LastPackage. |
|
a35b833ed992
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3433
diff
changeset
|
3278 |
]. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3279 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3280 |
fileName isNil ifTrue:[ |
| 1338 | 3281 |
fileName := (Smalltalk fileNameForClass:aClass) , '.st'. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3282 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3283 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3284 |
OperatingSystem isMSDOSlike ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3285 |
module replaceAll:$\ with:$/. |
| 1533 | 3286 |
directory replaceAll:$\ with:$/. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3287 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3288 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3289 |
"/ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3290 |
"/ check for conflicts (i.e. if such a container already exists) ... |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3291 |
"/ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3292 |
doCheckinWithoutAsking := false. |
|
1831
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3293 |
"/false ifTrue:[ |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3294 |
"/ (mgr checkForExistingContainer:fileName inModule:module directory:directory) ifTrue:[ |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3295 |
"/ answer := Dialog confirmWithCancel:(resources |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3296 |
"/ string:'About to change the source container. |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3297 |
"/ |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3298 |
"/Notice: there is a container for %1 in: |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3299 |
"/ |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3300 |
"/ %2 / %3 / %4 |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3301 |
"/ |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3302 |
"/Do you want to change it or check right into that container ?' |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3303 |
"/ with:className |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3304 |
"/ with:module |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3305 |
"/ with:directory |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3306 |
"/ with:fileName) |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3307 |
"/ labels:(resources array:#('Cancel' 'Check in' 'Change')).
|
|
3433
eee3079d18d3
AbortSignal -> AbortOperationRequest
Stefan Vogel <sv@exept.de>
parents:
3425
diff
changeset
|
3308 |
"/ answer isNil ifTrue:[AbortOperationRequest raise]. |
|
1831
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3309 |
"/ answer ifTrue:[ |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3310 |
"/ doCheckinWithoutAsking := false. |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3311 |
"/ oldModule := module. |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3312 |
"/ oldPackage := directory. |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3313 |
"/ oldFileName := fileName |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3314 |
"/ ] ifFalse:[ |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3315 |
"/ doCheckinWithoutAsking := true. |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3316 |
"/ creatingNew := false. |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3317 |
"/ ]. |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3318 |
"/ ]. |
|
cda120c93659
do not ask for changed source-container based on the default
sr
parents:
1828
diff
changeset
|
3319 |
"/]. |
|
2688
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3320 |
mgr isContainerBased ifTrue:[ |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3321 |
doCheckinWithoutAsking ifFalse:[ |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3322 |
"/ |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3323 |
"/ open a dialog for this |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3324 |
"/ |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3325 |
(mgr checkForExistingContainer:fileName inModule:module directory:directory) ifFalse:[ |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3326 |
note := 'Notice: class seems to have no container yet.'. |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3327 |
creatingNew := true. |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3328 |
] ifTrue:[ |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3329 |
creatingNew := false. |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3330 |
]. |
| 3992 | 3331 |
confirmNewContainer ifTrue:[ |
| 2847 | 3332 |
rslt := self |
3333 |
askForContainer:boxText title:title note:note |
|
3334 |
initialModule:module initialPackage:directory initialFileName:fileName |
|
3335 |
forNewContainer:true. |
|
3336 |
||
3337 |
rslt isNil ifTrue:[ |
|
3338 |
^ false |
|
3339 |
]. |
|
3340 |
||
3341 |
module := rslt at:#module. |
|
3342 |
directory := rslt at:#package. |
|
3343 |
fileName := rslt at:#fileName. |
|
| 4058 | 3344 |
(module isEmptyOrNil or:[fileName isEmptyOrNil]) ifTrue:[ |
|
3514
a35b833ed992
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3433
diff
changeset
|
3345 |
^ false |
|
a35b833ed992
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3433
diff
changeset
|
3346 |
]. |
| 4058 | 3347 |
(directory isEmptyOrNil) ifTrue:[ |
3348 |
"/ only one special case allowed - the module-folder description itself. |
|
3349 |
aClass name = module ifFalse:[^ false]. |
|
3350 |
] |
|
| 2847 | 3351 |
] |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3352 |
]. |
|
2688
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3353 |
(fileName endsWith:',v') ifTrue:[ |
|
3227
bcaec3eb2d97
Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents:
3202
diff
changeset
|
3354 |
fileName := fileName copyButLast:2 |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3355 |
]. |
|
2688
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3356 |
(fileName endsWith:'.st') ifFalse:[ |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3357 |
fileName := fileName , '.st' |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3358 |
]. |
|
fa8075458983
changed: #defineSourceContainerForClass:usingManager:title:text:createDirectories:createContainer:
Claus Gittinger <cg@exept.de>
parents:
2673
diff
changeset
|
3359 |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3360 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3361 |
|
|
952
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3362 |
"/ we require the packageID to be <module>:<container-dir> |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3363 |
"/ check for this ... |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3364 |
|
| 1533 | 3365 |
requiredPackage := ((module ? '') , ':' , (directory ? '')) asSymbol. |
|
952
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3366 |
requiredPackage ~= aClass package ifTrue:[ |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3367 |
"/ doCheckinWithoutAsking ifFalse:[ |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3368 |
"/ (self confirm:'Change the classes packageID to: ''', requiredPackage , ''' ?') |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3369 |
"/ ifFalse:[ |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3370 |
"/ ^ false |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3371 |
"/ ] |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3372 |
"/ ]. |
|
1077
6b1bcfd27521
renamed: #allSelectorsAndMethodsDo: into: #instAndClassSelectorsAndMethodsDo:
Claus Gittinger <cg@exept.de>
parents:
1076
diff
changeset
|
3373 |
aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage]. |
|
952
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3374 |
aClass package:requiredPackage. |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3375 |
]. |
|
c75976ac7b7f
when checking in initially, change packageID of class
Claus Gittinger <cg@exept.de>
parents:
937
diff
changeset
|
3376 |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3377 |
info := aClass revisionInfo. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3378 |
info notNil ifTrue:[ |
| 2063 | 3379 |
(info repositoryPathName isNil) ifTrue:[ |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3380 |
info := nil |
| 2063 | 3381 |
]. |
3382 |
"/ (info includesKey:#repositoryPathName) ifFalse:[ |
|
3383 |
"/ info := nil |
|
3384 |
"/ ] |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3385 |
]. |
| 2175 | 3386 |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3387 |
info isNil ifTrue:[ |
|
1004
1bd564960810
dont ask if a version method should be created - just do it.
Claus Gittinger <cg@exept.de>
parents:
1000
diff
changeset
|
3388 |
true "doCheckinWithoutAsking" ifFalse:[ |
| 979 | 3389 |
answer := Dialog |
3390 |
confirmWithCancel:(resources string:'%1 does not have any (usable) revision info (#version method)\\Shall I create one ?' with:className) withCRs |
|
| 1076 | 3391 |
labels:(resources array:#( 'Cancel' 'No' 'Yes')). |
| 979 | 3392 |
answer isNil ifTrue:[^ false]. |
3393 |
] ifTrue:[ |
|
3394 |
answer := true. |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3395 |
]. |
| 979 | 3396 |
answer ifTrue:[ |
| 2637 | 3397 |
mgr |
| 2651 | 3398 |
updateVersionMethodOf:aClass |
3399 |
for:(mgr initialRevisionStringFor:aClass |
|
3400 |
inModule:module |
|
3401 |
directory:directory |
|
3402 |
container:fileName). |
|
| 979 | 3403 |
]. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3404 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3405 |
|
| 2691 | 3406 |
(self checkForExistingModule:module usingManager:mgr allowCreate:(createDirs or:[creatingNew])) |
| 2651 | 3407 |
ifFalse:[^ false]. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3408 |
LastModule := module. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3409 |
|
| 2691 | 3410 |
(self checkForExistingModule:module directory:directory usingManager:mgr allowCreate:(createDirs or:[creatingNew])) |
| 2651 | 3411 |
ifFalse:[^ false]. |
| 1533 | 3412 |
LastPackage := directory. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3413 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3414 |
"/ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3415 |
"/ check for the container itself |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3416 |
"/ |
| 2651 | 3417 |
(mgr isContainerBased not |
3418 |
or:[ mgr checkForExistingContainer:fileName inModule:module directory:directory ]) ifTrue:[ |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3419 |
"/ (oldModule notNil |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3420 |
"/ and:[(oldModule ~= module) |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3421 |
"/ or:[oldPackage ~= package |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3422 |
"/ or:[oldFileName ~= fileName]]]) |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3423 |
"/ ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3424 |
"/ self warn:(resources string:'no change'). |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3425 |
"/ ^ false. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3426 |
"/ ]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3427 |
|
| 2651 | 3428 |
mgr isContainerBased ifTrue:[ |
3429 |
creatingNew ifTrue:[ |
|
3430 |
self warn:(resources string:'Container for %1 already exists in %2/%3.' with:fileName with:module with:directory) withCRs. |
|
3431 |
]. |
|
3432 |
||
3433 |
doCheckinWithoutAsking ifFalse:[ |
|
3434 |
(Dialog |
|
3435 |
confirm:(resources string:'check %1 into the existing container |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3436 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3437 |
%2 / %3 / %4 ?' |
| 2651 | 3438 |
with:className |
3439 |
with:module |
|
3440 |
with:directory |
|
3441 |
with:fileName) withCRs |
|
3442 |
noLabel:'Cancel') |
|
3443 |
ifFalse:[ |
|
3444 |
^ false. |
|
3445 |
]. |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3446 |
]. |
| 2651 | 3447 |
]. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3448 |
|
| 2637 | 3449 |
mgr |
| 2651 | 3450 |
updateVersionMethodOf:aClass |
3451 |
for:('$' , 'Header' , '$'). "/ concatenated to avoid RCS-expansion
|
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3452 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3453 |
oldFileName notNil ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3454 |
msg := ('forced checkin / source container change from ' , oldFileName).
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3455 |
] ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3456 |
msg := 'defined source container' |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3457 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3458 |
|
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3459 |
(forceCheckIn := doCheckinWithoutAsking) ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3460 |
(mgr |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3461 |
checkinClass:aClass |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3462 |
fileName:fileName |
| 1533 | 3463 |
directory:directory |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3464 |
module:module |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3465 |
logMessage:msg) |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3466 |
ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3467 |
doCheckinWithoutAsking ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3468 |
(Dialog |
| 1076 | 3469 |
confirm:'No easy merge seems possible; force checkin (no merge) ?' |
3470 |
noLabel:'Cancel') |
|
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3471 |
ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3472 |
^ false. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3473 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3474 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3475 |
forceCheckIn := true. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3476 |
] |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3477 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3478 |
forceCheckIn ifTrue:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3479 |
(mgr |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3480 |
checkinClass:aClass |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3481 |
fileName:fileName |
| 1533 | 3482 |
directory:directory |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3483 |
module:module |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3484 |
logMessage:msg |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3485 |
force:true) |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3486 |
ifFalse:[ |
| 1076 | 3487 |
self warn:(resources string:'Failed to check into existing container.'). |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3488 |
^ false. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3489 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3490 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3491 |
^ true |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3492 |
] ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3493 |
(createContainer or:[creatingNew]) ifFalse:[ |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3494 |
(Dialog |
| 1076 | 3495 |
confirm:(resources string:'No container exists for %1 in %2/%3\\create ?' |
| 1533 | 3496 |
with:fileName with:module with:directory) withCRs |
| 1076 | 3497 |
noLabel:'Cancel') ifFalse:[ |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3498 |
^ false |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3499 |
] |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3500 |
] |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3501 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3502 |
|
|
1882
8b3a4c2a2c2a
when creating a new container, set the package of all methods.
Claus Gittinger <cg@exept.de>
parents:
1879
diff
changeset
|
3503 |
aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage]. |
|
8b3a4c2a2c2a
when creating a new container, set the package of all methods.
Claus Gittinger <cg@exept.de>
parents:
1879
diff
changeset
|
3504 |
aClass package:requiredPackage. |
| 1913 | 3505 |
|
|
3155
9c22d8b4315b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3153
diff
changeset
|
3506 |
[ mgr |
| 2651 | 3507 |
createContainerFor:aClass |
3508 |
inModule:module |
|
3509 |
package:directory |
|
3510 |
container:fileName |
|
|
3155
9c22d8b4315b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3153
diff
changeset
|
3511 |
] whileFalse:[ |
|
9c22d8b4315b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3153
diff
changeset
|
3512 |
(Dialog confirm:(resources stringWithCRs:'Failed to create container.\(fix your setup then retry, or cancel)\\Retry?') yesLabel:'Retry') ifFalse:[ |
|
9c22d8b4315b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3153
diff
changeset
|
3513 |
^ false. |
|
9c22d8b4315b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3153
diff
changeset
|
3514 |
]. |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3515 |
]. |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3516 |
^ true |
| 1533 | 3517 |
|
| 2651 | 3518 |
"Created: / 21-12-2011 / 18:34:02 / cg" |
| 4007 | 3519 |
"Modified: / 30-04-2016 / 11:58:11 / cg" |
|
876
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3520 |
! |
|
461b86272f48
more functionality moved to SCMUtility
Claus Gittinger <cg@exept.de>
parents:
875
diff
changeset
|
3521 |
|
| 2189 | 3522 |
diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest |
| 3926 | 3523 |
^ self diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:false |
3524 |
! |
|
3525 |
||
3526 |
diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest extensionsOnly:extensionsOnly |
|
| 2939 | 3527 |
^ self |
3528 |
diffSetOfProject:aProject |
|
3529 |
againstRepositoryVersionFrom:aDateOrNilForNewest |
|
3530 |
orTag:nil |
|
| 3926 | 3531 |
extensionsOnly:extensionsOnly |
| 2939 | 3532 |
! |
3533 |
||
3534 |
diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest orTag:aTagOrNil |
|
|
2950
cd6dc0f1d994
comment/format in: #diffSetOfProject:againstRepositoryVersionFrom:orTag:
Claus Gittinger <cg@exept.de>
parents:
2949
diff
changeset
|
3535 |
"return a diffset against either the newest (head), or the version at a particular date, |
|
cd6dc0f1d994
comment/format in: #diffSetOfProject:againstRepositoryVersionFrom:orTag:
Claus Gittinger <cg@exept.de>
parents:
2949
diff
changeset
|
3536 |
or a the version with a particular tag." |
| 2939 | 3537 |
|
| 3926 | 3538 |
^ self |
3539 |
diffSetOfProject:aProject |
|
3540 |
againstRepositoryVersionFrom:aDateOrNilForNewest |
|
3541 |
orTag:aTagOrNil |
|
3542 |
extensionsOnly:false |
|
3543 |
||
3544 |
"Modified: / 01-11-2010 / 21:02:52 / cg" |
|
3545 |
! |
|
3546 |
||
3547 |
diffSetOfProject:aProject againstRepositoryVersionFrom:aDateOrNilForNewest orTag:aTagOrNil extensionsOnly:extensionsOnly |
|
| 4201 | 3548 |
"return a diffset against the version at a particular date (if not nil), |
3549 |
or a the version with a particular tag (if not nil), |
|
3550 |
or the newest (head) (if both are nil)." |
|
| 3926 | 3551 |
|
| 2189 | 3552 |
|classesInImage filesInImage module directory perProjectInfo |
3553 |
classesNotInRepository filesNotInImage classesDeletedInRepository |
|
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3554 |
classesModifiedInImage classesNotReallyModified classesReallyModified classesNewerInRepository |
| 2189 | 3555 |
classesAddedInImage extensionMethods extensionsInImage extensionsInRepository extensionDiffs |
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3556 |
box doCleanup diffSet def autoloadedFilesNotInImage |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3557 |
autoloadedClassesInImage autoloadedFilesInImage versionMethodsAndDoitsRejected| |
| 2189 | 3558 |
|
3559 |
module := aProject asPackageId module. |
|
3560 |
directory := aProject asPackageId directory. |
|
3561 |
||
| 2939 | 3562 |
(aDateOrNilForNewest isNil and:[ aTagOrNil notNil ]) ifTrue:[ |
3563 |
perProjectInfo := SourceCodeManager revisionsInModule:module directory:directory taggedAs:aTagOrNil. |
|
3564 |
] ifFalse:[ |
|
3565 |
perProjectInfo := SourceCodeManager revisionsInModule:module directory:directory fromDate:aDateOrNilForNewest. |
|
3566 |
]. |
|
| 2189 | 3567 |
perProjectInfo := perProjectInfo ? #(). |
3568 |
perProjectInfo := perProjectInfo select:[:info | info key asFilename hasSuffix:'st']. |
|
3569 |
perProjectInfo := Dictionary withAssociations:perProjectInfo. |
|
3570 |
||
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3571 |
"/ to ignore version_xxx methods |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3572 |
versionMethodsAndDoitsRejected := |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3573 |
[:aChangeSet | |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3574 |
aChangeSet reject:[:chg | |
| 2949 | 3575 |
false "chg isMethodChangeForVersionMethod" |
3576 |
or:[false "chg isMethodChangeForExtensionsVersionMethod" |
|
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3577 |
or:[chg isDoIt]]] |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3578 |
]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3579 |
|
| 2189 | 3580 |
classesInImage := Smalltalk allClassesInPackage:aProject. |
3581 |
autoloadedClassesInImage := classesInImage reject:[:cls | cls isLoaded]. |
|
|
2903
482f5086773d
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Stefan Vogel <sv@exept.de>
parents:
2864
diff
changeset
|
3582 |
classesInImage := classesInImage select:[:cls | cls isLoaded and:[cls isPrivate not]]. |
|
482f5086773d
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Stefan Vogel <sv@exept.de>
parents:
2864
diff
changeset
|
3583 |
filesInImage := classesInImage collect:[:cls | cls classBaseFilename] as:Set. |
|
482f5086773d
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Stefan Vogel <sv@exept.de>
parents:
2864
diff
changeset
|
3584 |
autoloadedFilesInImage := autoloadedClassesInImage collect:[:cls | cls classBaseFilename] as:Set. |
| 2189 | 3585 |
"/ any differences ? |
3586 |
classesNotInRepository := classesInImage reject:[:cls | (perProjectInfo includesKey:cls classBaseFilename)]. |
|
3587 |
classesDeletedInRepository := classesInImage select:[:cls | (perProjectInfo at:cls classBaseFilename ifAbsent:nil) == #deleted]. |
|
3588 |
perProjectInfo := perProjectInfo reject:[:v | v == #deleted]. |
|
3589 |
filesNotInImage := perProjectInfo keys reject:[:file | (filesInImage includes:file)]. |
|
3590 |
filesNotInImage := filesNotInImage reject:[:file | (autoloadedFilesInImage includes:file)]. |
|
3591 |
filesNotInImage remove:'extensions.st' ifAbsent:[]. |
|
3592 |
||
| 4338 | 3593 |
"/ if comparing against the newest, only look for changed stuff |
| 2189 | 3594 |
classesModifiedInImage := classesInImage select:[:cls | ChangeSet current includesChangeForClassOrMetaclass:cls]. |
3595 |
classesModifiedInImage := classesModifiedInImage \ classesNotInRepository. |
|
3596 |
||
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3597 |
classesNewerInRepository := classesInImage |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3598 |
select:[:cls | |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3599 |
|v clsRevision| |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3600 |
|
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3601 |
v := (perProjectInfo at:cls classBaseFilename ifAbsent:nil). |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3602 |
v notNil |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3603 |
and:[ cls isLoaded |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3604 |
and:[ (clsRevision := cls revision) notNil |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3605 |
and:[ v > clsRevision ]]] |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3606 |
]. |
| 2189 | 3607 |
|
3608 |
"/ stupid: as we do not have any revision information for extensions (sigh); |
|
3609 |
"/ we must checkout and look at the extension.st contents, to see if it has changed. |
|
3610 |
||
3611 |
extensionMethods := Smalltalk allExtensionsForPackage:aProject. |
|
3612 |
extensionsInImage := ChangeSet forExistingMethods:extensionMethods. |
|
3613 |
||
3614 |
[ |
|
3615 |
|s extensionsRevision| |
|
3616 |
||
3617 |
extensionsRevision := perProjectInfo at:'extensions.st' ifAbsent:#newest. |
|
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3618 |
[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3619 |
s := SourceCodeManager |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3620 |
streamForClass:nil fileName:'extensions.st' revision:extensionsRevision |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3621 |
directory:directory module:module cache:true. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3622 |
s notNil ifTrue:[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3623 |
extensionsInRepository := ChangeSet fromStream:s. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3624 |
]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3625 |
] ensure:[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3626 |
s notNil ifTrue:[s close] |
| 2189 | 3627 |
]. |
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3628 |
extensionsInRepository isNil ifTrue:[extensionsInRepository := ChangeSet new]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3629 |
|
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3630 |
"/ ignore package doIts and all extensionVersion_xxx methods |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3631 |
extensionsInRepository := versionMethodsAndDoitsRejected value:extensionsInRepository. |
| 2189 | 3632 |
] value. |
3633 |
extensionDiffs := extensionsInRepository diffSetsAgainst:extensionsInImage. |
|
| 3926 | 3634 |
extensionsOnly ifTrue:[ |
3635 |
^ extensionDiffs |
|
3636 |
]. |
|
3637 |
||
| 2189 | 3638 |
diffSet := extensionDiffs copy. |
3639 |
||
| 2939 | 3640 |
(aDateOrNilForNewest isNil and:[aTagOrNil isNil]) ifTrue:[ |
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3641 |
"/ we could do the same as below for each class. |
| 2189 | 3642 |
"/ however - as we do have change-info and revision info, we can avoid checking out |
3643 |
"/ for all classes which are not changed and which have the same version info. |
|
3644 |
classesModifiedInImage notEmpty ifTrue:[ |
|
3645 |
classesReallyModified := |
|
3646 |
classesModifiedInImage select:[:eachChangedClass | |
|
3647 |
|currentVersion repositoryVersion s stFile diffs| |
|
3648 |
||
3649 |
stFile := eachChangedClass classBaseFilename. |
|
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3650 |
[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3651 |
s := SourceCodeManager |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3652 |
streamForClass:nil fileName:stFile revision:#newest |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3653 |
directory:directory module:module cache:true. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3654 |
s notNil ifTrue:[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3655 |
repositoryVersion := ChangeSet fromStream:s. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3656 |
]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3657 |
] ensure:[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3658 |
s notNil ifTrue:[s close]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3659 |
]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3660 |
repositoryVersion isNil ifTrue:[ repositoryVersion := ChangeSet new ]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3661 |
repositoryVersion := versionMethodsAndDoitsRejected value:repositoryVersion. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3662 |
|
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3663 |
currentVersion := ChangeSet forExistingClass:eachChangedClass withExtensions:false withLooseMethods:true. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3664 |
currentVersion := versionMethodsAndDoitsRejected value:currentVersion. |
| 2189 | 3665 |
diffs := repositoryVersion diffSetsAgainst:currentVersion . |
3666 |
diffSet addDiffSet:diffs. |
|
3667 |
diffs notEmpty |
|
3668 |
]. |
|
3669 |
||
3670 |
classesNotReallyModified := classesModifiedInImage \ classesReallyModified. |
|
3671 |
]. |
|
3672 |
] ifFalse:[ |
|
3673 |
classesReallyModified := |
|
3674 |
classesInImage select:[:eachClass | |
|
3675 |
|currentVersion repositoryVersion s stFile stRevision diffs| |
|
3676 |
||
3677 |
stFile := eachClass classBaseFilename. |
|
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3678 |
stRevision := perProjectInfo at:stFile ifAbsent:nil. |
| 4338 | 3679 |
eachClass revision = stRevision ifTrue:[ |
3680 |
false |
|
3681 |
] ifFalse:[ |
|
3682 |
stRevision notNil ifTrue:[ |
|
3683 |
[ |
|
3684 |
s := SourceCodeManager |
|
3685 |
streamForClass:nil fileName:stFile revision:stRevision |
|
3686 |
directory:directory module:module cache:true. |
|
3687 |
s notNil ifTrue:[ |
|
3688 |
repositoryVersion := ChangeSet fromStream:s. |
|
3689 |
]. |
|
3690 |
] ensure:[ |
|
3691 |
s notNil ifTrue:[s close]. |
|
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3692 |
]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3693 |
]. |
| 4338 | 3694 |
repositoryVersion isNil ifTrue:[ |
3695 |
repositoryVersion := ChangeSet new. |
|
3696 |
]. |
|
3697 |
repositoryVersion := versionMethodsAndDoitsRejected value:repositoryVersion. |
|
3698 |
||
3699 |
currentVersion := ChangeSet forExistingClass:eachClass withExtensions:false withLooseMethods:true. |
|
3700 |
currentVersion := versionMethodsAndDoitsRejected value:currentVersion. |
|
3701 |
diffs := repositoryVersion diffSetsAgainst:currentVersion . |
|
3702 |
diffSet addDiffSet:diffs. |
|
3703 |
diffs notEmpty |
|
|
2295
505293d1cfbd
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2294
diff
changeset
|
3704 |
]. |
| 2189 | 3705 |
]. |
3706 |
]. |
|
3707 |
||
3708 |
filesNotInImage notEmpty ifTrue:[ |
|
3709 |
"/ first, check if these are autoloaded classes which have NOT been installed |
|
3710 |
"/ (for example, due to a --quick argument during startup) |
|
3711 |
autoloadedFilesNotInImage := OrderedCollection new. |
|
3712 |
||
3713 |
def := ProjectDefinition definitionClassForPackage:aProject createIfAbsent:false projectType:nil. |
|
3714 |
def notNil ifTrue:[ |
|
3715 |
def classNamesAndAttributesDo:[:eachClassname :eachAttributes | |
|
3716 |
|cls eachFileName isAutoload| |
|
3717 |
||
3718 |
cls := Smalltalk classNamed:eachClassname. |
|
3719 |
cls isNil ifTrue:[ |
|
3720 |
isAutoload := eachAttributes includes:#autoload. |
|
3721 |
isAutoload ifTrue:[ |
|
3722 |
eachFileName := Smalltalk fileNameForClass:eachClassname. |
|
3723 |
autoloadedFilesNotInImage add:(eachFileName , '.st') |
|
3724 |
] |
|
3725 |
] |
|
3726 |
]. |
|
3727 |
]. |
|
3728 |
||
3729 |
(filesNotInImage \ autoloadedFilesNotInImage) do:[:eachSTFile | |
|
3730 |
|s chgSet classDefinitions| |
|
3731 |
||
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3732 |
[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3733 |
s := SourceCodeManager |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3734 |
streamForClass:nil fileName:eachSTFile revision:#newest directory:directory module:module cache:true. |
|
3594
407ae2f32318
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3591
diff
changeset
|
3735 |
s isNil ifTrue:[ |
|
407ae2f32318
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3591
diff
changeset
|
3736 |
chgSet := ChangeSet new |
|
407ae2f32318
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3591
diff
changeset
|
3737 |
] ifFalse:[ |
|
407ae2f32318
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3591
diff
changeset
|
3738 |
chgSet := ChangeSet fromStream:s. |
|
407ae2f32318
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3591
diff
changeset
|
3739 |
] |
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3740 |
] ensure:[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3741 |
s notNil ifTrue:[s close]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3742 |
]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3743 |
chgSet := versionMethodsAndDoitsRejected value:chgSet. |
| 2189 | 3744 |
diffSet onlyInReceiver addAll:chgSet |
3745 |
]. |
|
3746 |
]. |
|
3747 |
||
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3748 |
classesNewerInRepository notEmpty ifTrue:[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3749 |
classesNewerInRepository do:[:eachClass| |
| 2189 | 3750 |
|s diffs repositoryVersion currentVersion| |
3751 |
||
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3752 |
[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3753 |
s := SourceCodeManager |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3754 |
streamForClass:eachClass fileName:nil revision:#newest directory:directory module:module cache:true. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3755 |
repositoryVersion := ChangeSet fromStream:s. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3756 |
] ensure:[ |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3757 |
s notNil ifTrue:[s close]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3758 |
]. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3759 |
|
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3760 |
currentVersion := ChangeSet forExistingClass:eachClass withExtensions:false withLooseMethods:true. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3761 |
currentVersion := versionMethodsAndDoitsRejected value:currentVersion. |
| 2189 | 3762 |
diffs := repositoryVersion diffSetsAgainst:currentVersion . |
3763 |
diffSet addDiffSet:diffs. |
|
3764 |
]. |
|
3765 |
]. |
|
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3766 |
|
| 2189 | 3767 |
classesDeletedInRepository notEmpty ifTrue:[ |
3768 |
"/ self halt. |
|
3769 |
]. |
|
3770 |
classesNotInRepository notEmpty ifTrue:[ |
|
3771 |
"/ if there are no changeSet entries for those classes, they seem to be |
|
3772 |
"/ no longer in the repository (possibly moved ?) |
|
3773 |
"/ If there are entries, these might have been added in the image and need a check-in |
|
3774 |
||
3775 |
classesAddedInImage := classesNotInRepository \ classesDeletedInRepository. |
|
3776 |
classesAddedInImage do:[:eachAddedClass | |
|
3777 |
|currentVersion| |
|
3778 |
||
|
2948
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3779 |
currentVersion := ChangeSet forExistingClass:eachAddedClass withExtensions:false withLooseMethods:true. |
|
548a75a5a3b5
project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents:
2939
diff
changeset
|
3780 |
currentVersion := versionMethodsAndDoitsRejected value:currentVersion. |
| 2189 | 3781 |
diffSet onlyInArg addAll:currentVersion. |
3782 |
]. |
|
3783 |
]. |
|
3784 |
||
3785 |
diffSet isEmpty ifTrue:[ |
|
3786 |
"/ Dialog information:(resources string:'%1 is up-to-date.' with:eachProject allBold). |
|
| 4458 | 3787 |
Transcript showCR:'%1 is up-to-date.' with:aProject allBold. |
| 2189 | 3788 |
(ChangeSet current includesChangeForPackage:aProject) ifTrue:[ |
3789 |
(Dialog confirm:('%1 is up-to-date.\\Cleanup ChangeSet ?' bindWith:aProject allBold) withCRs) ifTrue:[
|
|
3790 |
ChangeSet current condenseChangesForPackage:aProject. |
|
3791 |
]. |
|
3792 |
]. |
|
|
2286
ad425b1c40ab
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2284
diff
changeset
|
3793 |
^ diffSet. |
| 2189 | 3794 |
]. |
3795 |
||
| 3906 | 3796 |
diffSet sortByClassName. |
3797 |
||
| 2189 | 3798 |
"/ as a side-effect, if we find that some classes are modified but the same as in the repository, |
3799 |
"/ give user a chance to cleanup the changeSet here. |
|
3800 |
aDateOrNilForNewest isNil ifTrue:[ |
|
3801 |
classesNotReallyModified notEmptyOrNil ifTrue:[ |
|
3802 |
doCleanup := false. |
|
3803 |
box := Dialog |
|
3804 |
forRequestText:(resources |
|
| 2939 | 3805 |
stringWithCRs:'The following classes from %1 are equal to the repository version.\\Remove entries from the changeSet?' |
| 2189 | 3806 |
with:aProject allBold) |
3807 |
editViewClass:ListView |
|
3808 |
lines:10 columns:20 |
|
|
3199
830195868b71
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3155
diff
changeset
|
3809 |
initialAnswer:nil |
| 2189 | 3810 |
setupWith: |
3811 |
[:v :d | |
|
3812 |
|removeButton| |
|
3813 |
||
3814 |
v list:classesNotReallyModified. |
|
3815 |
removeButton := Button label:(resources string:'Cleanup ChangeSet'). |
|
3816 |
removeButton action:[ doCleanup := true. box okPressed. ]. |
|
3817 |
d addButton:removeButton after:(d okButton). |
|
3818 |
d okButton label:(resources string:'Continue'). |
|
3819 |
d okButton isReturnButton:false. |
|
3820 |
removeButton isReturnButton:true. |
|
3821 |
]. |
|
3822 |
box open. |
|
|
2286
ad425b1c40ab
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2284
diff
changeset
|
3823 |
box accepted ifTrue:[ |
|
ad425b1c40ab
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2284
diff
changeset
|
3824 |
doCleanup ifTrue:[ |
|
ad425b1c40ab
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2284
diff
changeset
|
3825 |
classesNotReallyModified do:[:class | |
|
ad425b1c40ab
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2284
diff
changeset
|
3826 |
ChangeSet current condenseChangesForClass:class. |
|
ad425b1c40ab
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2284
diff
changeset
|
3827 |
] |
|
ad425b1c40ab
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2284
diff
changeset
|
3828 |
]. |
|
ad425b1c40ab
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2284
diff
changeset
|
3829 |
] |
| 2189 | 3830 |
]. |
3831 |
]. |
|
3832 |
^ diffSet |
|
|
2286
ad425b1c40ab
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2284
diff
changeset
|
3833 |
|
|
2295
505293d1cfbd
changed: #diffSetOfProject:againstRepositoryVersionFrom:
Claus Gittinger <cg@exept.de>
parents:
2294
diff
changeset
|
3834 |
"Modified: / 01-11-2010 / 21:02:52 / cg" |
| 4201 | 3835 |
"Modified (comment): / 04-02-2017 / 18:49:12 / cg" |
| 4338 | 3836 |
"Modified: / 02-07-2018 / 14:01:01 / Claus Gittinger" |
| 2189 | 3837 |
! |
3838 |
||
| 2939 | 3839 |
diffSetOfProject:aProject againstRepositoryVersionTaggedAs:symbolicName |
3840 |
^ self |
|
3841 |
diffSetOfProject:aProject |
|
3842 |
againstRepositoryVersionFrom:nil |
|
3843 |
orTag:symbolicName |
|
3844 |
! |
|
3845 |
||
| 4132 | 3846 |
diffSetOfProject:aProject againstRepositoryVersionTaggedAs:aTag extensionsOnly:extensionsOnly |
3847 |
^ self |
|
3848 |
diffSetOfProject:aProject |
|
3849 |
againstRepositoryVersionFrom:nil |
|
3850 |
orTag:aTag |
|
3851 |
extensionsOnly:extensionsOnly |
|
3852 |
||
3853 |
"Created: / 12-11-2016 / 03:41:23 / cg" |
|
3854 |
! |
|
3855 |
||
| 4201 | 3856 |
diffSetOfProject:aProject |
3857 |
repositoryVersionFrom:aDateOrNilV1 orTag:aTagOrNilV1 |
|
3858 |
againstRepositoryVersionFrom:aDateOrNilV2 orTag:aTagOrNilV2 extensionsOnly:extensionsOnly |
|
3859 |
"return a diffset of two repository versions, |
|
3860 |
each specified by either a version at a particular date, |
|
3861 |
or a the version with a particular tag." |
|
3862 |
||
3863 |
|"classesInImage filesInImage" module directory |
|
3864 |
perProjectInfoV1 perProjectInfoV2 |
|
3865 |
filesInRepositoryV1 filesInRepositoryV2 |
|
3866 |
filesAddedInV2 filesDeletedInV2 filesModified filesReallyModified |
|
| 4204 | 3867 |
unchanged "filesNotInImage" "classesAddedInImage extensionMethods" |
3868 |
extensionsInRepositoryV1 extensionsInRepositoryV2 extensionDiffs diffSet "autoloadedClassesInImage autoloadedFilesInImage" versionMethodsAndDoitsRejected| |
|
| 4201 | 3869 |
|
3870 |
module := aProject asPackageId module. |
|
3871 |
directory := aProject asPackageId directory. |
|
3872 |
||
3873 |
(aDateOrNilV1 isNil and:[ aTagOrNilV1 isNil ]) ifTrue:[ self error:'must specify either date or tag']. |
|
3874 |
(aDateOrNilV2 isNil and:[ aTagOrNilV2 isNil ]) ifTrue:[ self error:'must specify either date or tag']. |
|
3875 |
||
3876 |
aDateOrNilV1 isNil ifTrue:[ |
|
3877 |
perProjectInfoV1 := SourceCodeManager revisionsInModule:module directory:directory taggedAs:aTagOrNilV1. |
|
3878 |
] ifFalse:[ |
|
3879 |
perProjectInfoV1 := SourceCodeManager revisionsInModule:module directory:directory fromDate:aDateOrNilV1. |
|
3880 |
]. |
|
3881 |
perProjectInfoV1 := perProjectInfoV1 ? #(). |
|
3882 |
perProjectInfoV1 := perProjectInfoV1 select:[:info | info key asFilename hasSuffix:'st']. |
|
3883 |
perProjectInfoV1 := Dictionary withAssociations:perProjectInfoV1. |
|
3884 |
||
3885 |
aDateOrNilV2 isNil ifTrue:[ |
|
3886 |
perProjectInfoV2 := SourceCodeManager revisionsInModule:module directory:directory taggedAs:aTagOrNilV2. |
|
3887 |
] ifFalse:[ |
|
3888 |
perProjectInfoV2 := SourceCodeManager revisionsInModule:module directory:directory fromDate:aDateOrNilV2. |
|
3889 |
]. |
|
3890 |
perProjectInfoV2 := perProjectInfoV2 ? #(). |
|
3891 |
perProjectInfoV2 := perProjectInfoV2 select:[:info | info key asFilename hasSuffix:'st']. |
|
3892 |
perProjectInfoV2 := Dictionary withAssociations:perProjectInfoV2. |
|
3893 |
||
3894 |
filesInRepositoryV1 := perProjectInfoV1 keys. |
|
3895 |
filesInRepositoryV2 := perProjectInfoV2 keys. |
|
3896 |
filesInRepositoryV1 := filesInRepositoryV1 reject:[:fileName | (perProjectInfoV1 at:fileName) == #deleted]. |
|
3897 |
filesInRepositoryV2 := filesInRepositoryV2 reject:[:fileName | (perProjectInfoV2 at:fileName) == #deleted]. |
|
3898 |
||
3899 |
"/ first remove classes which have the same version |
|
3900 |
unchanged := filesInRepositoryV1 select:[:fileName | |
|
3901 |
(filesInRepositoryV2 includes:fileName) |
|
3902 |
and:[ (perProjectInfoV1 at:fileName) = (perProjectInfoV2 at:fileName) ] |
|
3903 |
]. |
|
3904 |
filesInRepositoryV1 removeAll:unchanged. |
|
3905 |
filesInRepositoryV2 removeAll:unchanged. |
|
3906 |
||
3907 |
filesAddedInV2 := filesInRepositoryV2 select:[:fileName | (filesInRepositoryV1 includes:fileName) not]. |
|
3908 |
filesDeletedInV2 := filesInRepositoryV1 select:[:fileName | (filesInRepositoryV2 includes:fileName) not]. |
|
3909 |
||
3910 |
filesModified := filesInRepositoryV1 select:[:fileName | filesInRepositoryV2 includes:fileName]. |
|
3911 |
||
3912 |
"/ to ignore version_xxx methods |
|
3913 |
versionMethodsAndDoitsRejected := |
|
3914 |
[:aChangeSet | |
|
3915 |
aChangeSet reject:[:chg | |
|
3916 |
false "chg isMethodChangeForVersionMethod" |
|
3917 |
or:[false "chg isMethodChangeForExtensionsVersionMethod" |
|
3918 |
or:[chg isDoIt]]] |
|
3919 |
]. |
|
3920 |
||
3921 |
"/ stupid: as we do not have any revision information for extensions (sigh); |
|
3922 |
"/ we must checkout and look at the extension.st contents, to see if it has changed. |
|
3923 |
||
3924 |
[ |
|
3925 |
|s extensionsRevisionV1 extensionsRevisionV2| |
|
3926 |
||
3927 |
extensionsRevisionV1 := perProjectInfoV1 at:'extensions.st' ifAbsent:nil. |
|
3928 |
extensionsRevisionV1 notNil ifTrue:[ |
|
3929 |
[ |
|
3930 |
s := SourceCodeManager |
|
3931 |
streamForClass:nil fileName:'extensions.st' revision:extensionsRevisionV1 |
|
3932 |
directory:directory module:module cache:true. |
|
3933 |
s notNil ifTrue:[ |
|
3934 |
extensionsInRepositoryV1 := ChangeSet fromStream:s. |
|
3935 |
]. |
|
3936 |
] ensure:[ |
|
3937 |
s notNil ifTrue:[s close] |
|
3938 |
]. |
|
3939 |
]. |
|
3940 |
extensionsInRepositoryV1 isNil ifTrue:[ |
|
3941 |
extensionsInRepositoryV1 := ChangeSet new |
|
3942 |
] ifFalse:[ |
|
3943 |
"/ ignore package doIts and all extensionVersion_xxx methods |
|
3944 |
extensionsInRepositoryV1 := versionMethodsAndDoitsRejected value:extensionsInRepositoryV1. |
|
3945 |
]. |
|
3946 |
||
3947 |
"/ ------ |
|
3948 |
extensionsRevisionV2 := perProjectInfoV2 at:'extensions.st' ifAbsent:nil. |
|
3949 |
extensionsRevisionV2 notNil ifTrue:[ |
|
3950 |
[ |
|
3951 |
s := SourceCodeManager |
|
3952 |
streamForClass:nil fileName:'extensions.st' revision:extensionsRevisionV2 |
|
3953 |
directory:directory module:module cache:true. |
|
3954 |
s notNil ifTrue:[ |
|
3955 |
extensionsInRepositoryV1 := ChangeSet fromStream:s. |
|
3956 |
]. |
|
3957 |
] ensure:[ |
|
3958 |
s notNil ifTrue:[s close] |
|
3959 |
]. |
|
3960 |
]. |
|
3961 |
extensionsInRepositoryV2 isNil ifTrue:[ |
|
3962 |
extensionsInRepositoryV2 := ChangeSet new |
|
3963 |
] ifFalse:[ |
|
3964 |
"/ ignore package doIts and all extensionVersion_xxx methods |
|
3965 |
extensionsInRepositoryV2 := versionMethodsAndDoitsRejected value:extensionsInRepositoryV2. |
|
3966 |
]. |
|
3967 |
] value. |
|
3968 |
||
3969 |
extensionDiffs := extensionsInRepositoryV1 diffSetsAgainst:extensionsInRepositoryV2. |
|
3970 |
extensionsOnly ifTrue:[ |
|
3971 |
^ extensionDiffs |
|
3972 |
]. |
|
3973 |
||
3974 |
diffSet := extensionDiffs copy. |
|
3975 |
||
3976 |
filesReallyModified := |
|
3977 |
filesInRepositoryV2 select:[:eachFile | |
|
3978 |
|repositoryVersion1 repositoryVersion2 s stRevision diffs| |
|
3979 |
||
3980 |
stRevision := perProjectInfoV1 at:eachFile ifAbsent:nil. |
|
3981 |
stRevision notNil ifTrue:[ |
|
3982 |
[ |
|
3983 |
s := SourceCodeManager |
|
3984 |
streamForClass:nil fileName:eachFile revision:stRevision |
|
3985 |
directory:directory module:module cache:true. |
|
3986 |
s notNil ifTrue:[ |
|
3987 |
repositoryVersion1 := ChangeSet fromStream:s. |
|
3988 |
]. |
|
3989 |
] ensure:[ |
|
3990 |
s notNil ifTrue:[s close]. |
|
3991 |
]. |
|
3992 |
]. |
|
3993 |
repositoryVersion1 isNil ifTrue:[ |
|
3994 |
repositoryVersion1 := ChangeSet new. |
|
3995 |
]. |
|
3996 |
repositoryVersion1 := versionMethodsAndDoitsRejected value:repositoryVersion1. |
|
3997 |
||
3998 |
stRevision := perProjectInfoV2 at:eachFile ifAbsent:nil. |
|
3999 |
stRevision notNil ifTrue:[ |
|
4000 |
[ |
|
4001 |
s := SourceCodeManager |
|
4002 |
streamForClass:nil fileName:eachFile revision:stRevision |
|
4003 |
directory:directory module:module cache:true. |
|
4004 |
s notNil ifTrue:[ |
|
4005 |
repositoryVersion2 := ChangeSet fromStream:s. |
|
4006 |
]. |
|
4007 |
] ensure:[ |
|
4008 |
s notNil ifTrue:[s close]. |
|
4009 |
]. |
|
4010 |
]. |
|
4011 |
repositoryVersion2 isNil ifTrue:[ |
|
4012 |
repositoryVersion2 := ChangeSet new. |
|
4013 |
]. |
|
4014 |
repositoryVersion2 := versionMethodsAndDoitsRejected value:repositoryVersion2. |
|
4015 |
||
4016 |
diffs := repositoryVersion1 diffSetsAgainst:repositoryVersion2 . |
|
4017 |
diffSet addDiffSet:diffs. |
|
4018 |
diffs notEmpty |
|
4019 |
]. |
|
4020 |
||
4021 |
diffSet isEmpty ifTrue:[ |
|
4022 |
"/ Dialog information:(resources string:'%1 is up-to-date.' with:eachProject allBold). |
|
4023 |
Transcript showCR:('%1 not changed between %2 and %3.'
|
|
4024 |
bindWith:aProject allBold |
|
4025 |
with:(aDateOrNilV1 ? aTagOrNilV1) |
|
4026 |
with:(aDateOrNilV2 ? aTagOrNilV2)). |
|
4027 |
^ diffSet. |
|
4028 |
]. |
|
4029 |
||
4030 |
diffSet sortByClassName. |
|
4031 |
^ diffSet |
|
4032 |
||
4033 |
"Created: / 04-02-2017 / 17:27:47 / cg" |
|
| 4204 | 4034 |
"Modified: / 05-02-2017 / 10:04:50 / cg" |
| 4201 | 4035 |
! |
4036 |
||
| 2691 | 4037 |
ensureCorrectVersionMethodsInClass:aClass usingManager:aManager |
|
3674
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4038 |
|theMetaclass versionMthd src newSrc versionMethodName oldVersionMethodName| |
| 2383 | 4039 |
|
4040 |
theMetaclass := aClass theMetaclass. |
|
4041 |
versionMethodName := aManager nameOfVersionMethodInClasses. |
|
|
2442
7ecd9a4248bb
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2426
diff
changeset
|
4042 |
oldVersionMethodName := aClass nameOfOldVersionMethod. |
| 2383 | 4043 |
|
4044 |
(theMetaclass includesSelector:versionMethodName) ifTrue:[ |
|
|
2442
7ecd9a4248bb
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2426
diff
changeset
|
4045 |
"/ (theMetaclass includesSelector:oldVersionMethodName) ifTrue:[ |
|
7ecd9a4248bb
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2426
diff
changeset
|
4046 |
"/ theMetaclass removeSelector:oldVersionMethodName. |
|
7ecd9a4248bb
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2426
diff
changeset
|
4047 |
"/ ]. |
| 2383 | 4048 |
"/ ensure that my version method is parsable (contains $'s) |
|
3674
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4049 |
versionMthd := theMetaclass compiledMethodAt:versionMethodName. |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4050 |
versionMthd notNil ifTrue:[ |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4051 |
src := versionMthd source. |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4052 |
src notNil ifTrue:[ |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4053 |
newSrc := aManager ensureDollarsInVersionMethod:src. |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4054 |
newSrc ~= src ifTrue:[ |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4055 |
theMetaclass compile:newSrc categorized:#documentation. |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4056 |
] |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4057 |
]. |
| 2383 | 4058 |
]. |
4059 |
] ifFalse:[ |
|
4060 |
(theMetaclass includesSelector:oldVersionMethodName) ifTrue:[ |
|
|
2487
c8f4417b9edc
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2484
diff
changeset
|
4061 |
"/ but make sure, it is a version method for this sourcecodemanager... |
|
c8f4417b9edc
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2484
diff
changeset
|
4062 |
(theMetaclass methodDictionary keys count:[:sel | sel startsWith:'version']) size == 1 ifTrue:[ |
|
3674
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4063 |
versionMthd := theMetaclass compiledMethodAt:oldVersionMethodName. |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4064 |
versionMthd notNil ifTrue:[ |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4065 |
src := versionMthd source. |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4066 |
(src startsWith:oldVersionMethodName) ifTrue:[ |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4067 |
newSrc := versionMethodName , (src copyFrom:(oldVersionMethodName size + 1)) |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4068 |
]. |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4069 |
theMetaclass compile:newSrc categorized:#documentation. |
|
d9b94d8afb2c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3657
diff
changeset
|
4070 |
] |
|
2487
c8f4417b9edc
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2484
diff
changeset
|
4071 |
] |
| 2383 | 4072 |
]. |
4073 |
]. |
|
|
2442
7ecd9a4248bb
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2426
diff
changeset
|
4074 |
|
|
2487
c8f4417b9edc
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2484
diff
changeset
|
4075 |
"Modified: / 20-08-2011 / 14:40:27 / cg" |
| 2691 | 4076 |
"Created: / 29-12-2011 / 14:33:46 / cg" |
| 2383 | 4077 |
! |
4078 |
||
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4079 |
fetchSourceOf:aClass askForRevision:askForRevision into:aBlockToReturnMultipleValues |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4080 |
"fetch the source of either the newest version or the revision being asked for, |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4081 |
or nil, if there are any problems. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4082 |
Helper method" |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4083 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4084 |
|classToCompare aStream comparedSource rev revString mgr |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4085 |
nm msg revisionInClass newestRev| |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4086 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4087 |
classToCompare := aClass theNonMetaclass. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4088 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4089 |
nm := classToCompare name. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4090 |
(mgr := manager) isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4091 |
mgr := self sourceCodeManagerFor:classToCompare. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4092 |
mgr isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4093 |
self error:'oops - no sourcecode manager' mayProceed:true. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4094 |
^ nil |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4095 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4096 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4097 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4098 |
rev := classToCompare revisionInfoOfManager:mgr. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4099 |
"/ rev := classToCompare binaryRevision. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4100 |
revisionInClass := classToCompare revisionOfManager:mgr. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4101 |
rev isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4102 |
rev := revisionInClass |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4103 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4104 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4105 |
"/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4106 |
"/ class in repository - ask for revision |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4107 |
"/ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4108 |
SourceCodeManagerError handle:[:ex | |
| 4448 | 4109 |
rev isNil ifTrue:[ |
4110 |
Dialog warn:'Class is not yet in the repository\(or classes revision info is missing or corrupted)' withCRs. |
|
4111 |
^ nil |
|
4112 |
]. |
|
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4113 |
Dialog warn:(resources |
| 4362 | 4114 |
stringWithCRs:'Could not fetch revision info of "%1".\Reported error: %4\\Please check your sourcecode manager settings of %2 for package: "%3".\(and possibly the network for reachability of the repository)' |
4115 |
with:classToCompare name |
|
4116 |
with:classToCompare sourceCodeManager managerTypeName |
|
4117 |
with:classToCompare package |
|
4118 |
with:(ex description asString withoutSeparators)). |
|
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4119 |
^ nil. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4120 |
] do:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4121 |
newestRev := mgr newestRevisionOf:classToCompare. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4122 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4123 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4124 |
askForRevision ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4125 |
msg := resources string:'Compare to revision: (empty for newest)'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4126 |
rev notNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4127 |
msg := msg , '\\' , (resources string:'Current %1 is based upon rev %2.' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4128 |
with:nm allBold with:rev). |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4129 |
(revisionInClass notNil and:[revisionInClass ~= rev]) ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4130 |
msg := msg , '\' , (resources string:'And has been checked into the repository as %1.' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4131 |
with:revisionInClass) |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4132 |
] |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4133 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4134 |
newestRev notNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4135 |
msg := msg , '\' , (resources string:'Newest in repository is %1.' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4136 |
with:newestRev) |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4137 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4138 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4139 |
rev := self |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4140 |
askForExistingRevision:msg |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4141 |
title:'Compare with repository' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4142 |
class:classToCompare. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4143 |
] ifFalse:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4144 |
rev := newestRev. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4145 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4146 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4147 |
rev isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4148 |
mgr = classToCompare sourceCodeManager ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4149 |
msg := 'Could not figure out the newest revision of "%1".\\Please check if this class is really contained in that repository,\and also your sourcecode manager settings of %2 for package: "%3".\(and possibly the network for reachability of the repository)' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4150 |
] ifFalse:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4151 |
msg := 'Could not figure out the newest revision of "%1".\\Notice that the class is actually maintained by %4, not %2.\Please check if this class is really in the %2 repository,\and also your sourcecode manager settings of %2 for package: "%3".\(and possibly the network for reachability of the repository)' |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4152 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4153 |
Dialog warn:(resources |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4154 |
stringWithCRs:msg |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4155 |
with:classToCompare name |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4156 |
with:mgr managerTypeName |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4157 |
with:classToCompare package |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4158 |
with:(classToCompare sourceCodeManager managerTypeName)). |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4159 |
^ nil. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4160 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4161 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4162 |
rev withoutSpaces isEmpty ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4163 |
msg := 'extracting newest %1 (' , (newestRev ? '???') , ')'.
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4164 |
"/ aStream := mgr getMostRecentSourceStreamForClassNamed:nm. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4165 |
aStream := mgr getSourceStreamFor:classToCompare revision:newestRev. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4166 |
revString := '(newest: ' , (newestRev ? '???') , ')'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4167 |
] ifFalse:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4168 |
msg := 'extracting previous %1'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4169 |
aStream := mgr getSourceStreamFor:classToCompare revision:rev. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4170 |
revString := rev |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4171 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4172 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4173 |
aStream isNil ifTrue:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4174 |
self warn:'Could not extract source from repository (check repository settings / network)'. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4175 |
^ nil |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4176 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4177 |
aStream class readErrorSignal handle:[:ex | |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4178 |
self warn:('Read error while reading extracted source\\' , ex description) withCRs.
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4179 |
aStream close. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4180 |
^ nil |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4181 |
] do:[ |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4182 |
comparedSource := aStream contents asString. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4183 |
]. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4184 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4185 |
aStream close. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4186 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4187 |
aBlockToReturnMultipleValues |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4188 |
value:revString |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4189 |
value:revisionInClass |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4190 |
value:mgr. |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4191 |
^ comparedSource |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4192 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4193 |
" |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4194 |
self compareClassWithRepository:Array |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4195 |
" |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4196 |
|
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4197 |
"Modified: / 24-07-2012 / 18:11:27 / cg" |
| 4448 | 4198 |
"Modified: / 23-06-2019 / 18:43:26 / Claus Gittinger" |
|
3896
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4199 |
! |
|
41784f108832
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3892
diff
changeset
|
4200 |
|
| 4490 | 4201 |
getLogMessageForCheckinTakingDefaultsFromPreviousLogInfo:aLogInfoOrNil |
4202 |
initialLogMessage:initialLogMessage title:title |
|
4203 |
isClassCheckin:isClassCheckin |
|
4204 |
showChangesAction:showChangesAction |
|
4205 |
validateConsistencyAction:validateConsistencyAction |
|
4206 |
valuesInto:aBlock |
|
4207 |
||
|
3325
944f6a6e66ff
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3313
diff
changeset
|
4208 |
"open a dialog, asking for commit/checkin log info. |
| 4490 | 4209 |
Returns 2 values: |
4210 |
a log message |
|
4211 |
and additional checkinInfo (containing things like markAsStable, etc,)" |
|
4212 |
||
4213 |
|checkinInfo reasonLine logMessage checkinReason| |
|
| 2383 | 4214 |
|
4215 |
"/ heuristics for a useful initial log message... |
|
4216 |
aLogInfoOrNil isNil ifTrue:[ |
|
| 4359 | 4217 |
checkinInfo := self |
| 4490 | 4218 |
getCheckinInfoFor:title |
| 4359 | 4219 |
initialAnswer:initialLogMessage |
4220 |
withQuickOption:false |
|
| 4490 | 4221 |
withValidateConsistencyOption:(validateConsistencyAction notNil) |
4222 |
isClassCheckin:isClassCheckin |
|
4223 |
showChangesAction:showChangesAction. |
|
| 4359 | 4224 |
|
4225 |
checkinInfo isNil ifTrue:[^ false]. |
|
4226 |
||
4227 |
checkinInfo validateConsistency ifTrue:[ |
|
| 4490 | 4228 |
validateConsistencyAction value. |
| 4079 | 4229 |
]. |
4230 |
||
| 2383 | 4231 |
logMessage := checkinInfo logMessage. |
| 4470 | 4232 |
checkinReason := checkinInfo checkinReason. |
| 3900 | 4233 |
|
4234 |
reasonLine := '#OTHER'. |
|
| 4470 | 4235 |
checkinReason == Tools::CheckinInfoDialog reasonBugfix ifTrue:[ |
| 3900 | 4236 |
reasonLine := '#BUGFIX' |
4237 |
] ifFalse:[ |
|
| 4470 | 4238 |
checkinReason == Tools::CheckinInfoDialog reasonFeature ifTrue:[ |
| 3900 | 4239 |
reasonLine := '#FEATURE' |
4240 |
] ifFalse:[ |
|
| 4470 | 4241 |
checkinReason == Tools::CheckinInfoDialog reasonRefactoring ifTrue:[ |
| 3900 | 4242 |
reasonLine := '#REFACTORING' |
| 3906 | 4243 |
] ifFalse:[ |
| 4470 | 4244 |
checkinReason == Tools::CheckinInfoDialog reasonDocumentation ifTrue:[ |
| 3906 | 4245 |
reasonLine := '#DOCUMENTATION' |
4246 |
] ifFalse:[ |
|
| 4470 | 4247 |
checkinReason == Tools::CheckinInfoDialog reasonUIEnhancement ifTrue:[ |
| 3906 | 4248 |
reasonLine := '#UI_ENHANCEMENT' |
| 3971 | 4249 |
] ifFalse:[ |
| 4470 | 4250 |
checkinReason == Tools::CheckinInfoDialog reasonQuality ifTrue:[ |
| 3971 | 4251 |
reasonLine := '#QUALITY' |
4252 |
] ifFalse:[ |
|
| 4470 | 4253 |
checkinReason == Tools::CheckinInfoDialog reasonTuning ifTrue:[ |
| 3971 | 4254 |
reasonLine := '#TUNING' |
| 4470 | 4255 |
] ifFalse:[ |
4256 |
checkinReason == Tools::CheckinInfoDialog reasonWorkaround ifTrue:[ |
|
4257 |
reasonLine := '#WORKAROUND' |
|
4258 |
] |
|
| 3971 | 4259 |
] |
4260 |
] |
|
| 3906 | 4261 |
] |
4262 |
] |
|
| 3900 | 4263 |
] |
4264 |
] |
|
4265 |
] |
|
| 2383 | 4266 |
] ifFalse:[ |
4267 |
aLogInfoOrNil isString ifTrue:[ |
|
4268 |
"soon obsolete..." |
|
4269 |
logMessage := aLogInfoOrNil |
|
4270 |
] ifFalse:[ |
|
4271 |
checkinInfo := aLogInfoOrNil. |
|
4272 |
logMessage := checkinInfo logMessage. |
|
4273 |
]. |
|
4274 |
]. |
|
4275 |
logMessage notNil ifTrue:[ |
|
4276 |
logMessage := logMessage asSingleByteStringReplaceInvalidWith:$? |
|
4277 |
]. |
|
| 3974 | 4278 |
reasonLine isNil ifTrue:[ |
4279 |
reasonLine := '#OTHER'. |
|
| 3900 | 4280 |
]. |
| 3974 | 4281 |
logMessage := reasonLine , ' by ',OperatingSystem getLoginName,'\' withCRs |
4282 |
, (logMessage ? ''). |
|
| 2383 | 4283 |
aBlock value:logMessage value:checkinInfo. |
4284 |
^ true |
|
| 3971 | 4285 |
|
4286 |
"Modified: / 31-03-2016 / 17:58:11 / cg" |
|
| 4230 | 4287 |
"Modified: / 17-03-2017 / 18:00:12 / stefan" |
| 2383 | 4288 |
! |
4289 |
||
| 4490 | 4290 |
getLogMessageForClassCheckinTakingDefaultsFromPreviousLogInfo:aLogInfoOrNil forClass:aClassOrNil valuesInto:aBlock |
4291 |
"open a dialog, asking for commit/checkin log info for a class checkin. |
|
4292 |
Returns 2 values: |
|
4293 |
a log message |
|
4294 |
and additional checkinInfo (containing things like markAsStable, etc,)" |
|
4295 |
||
4296 |
|initialLogMessage| |
|
4297 |
||
4298 |
initialLogMessage := (self class goodInitialLogMessageForCheckinClassOfClass:aClassOrNil) ? ''. |
|
4299 |
"/ initial checkin ? |
|
4300 |
(aClassOrNil package isNil or:[(aClassOrNil revisionOfManager:manager) "revision" isNil]) ifTrue:[ |
|
4301 |
initialLogMessage := 'initial checkin\\' withCRs , initialLogMessage |
|
4302 |
]. |
|
4303 |
^ self |
|
4304 |
getLogMessageForCheckinTakingDefaultsFromPreviousLogInfo:aLogInfoOrNil |
|
4305 |
initialLogMessage:initialLogMessage title:(aClassOrNil name) |
|
4306 |
isClassCheckin:aClassOrNil notNil |
|
4307 |
showChangesAction:[ |
|
4308 |
"/ that is passed to the dialog's 'what changed' button |
|
4309 |
self compareClassWithRepository:aClassOrNil askForRevision:false |
|
4310 |
] |
|
4311 |
validateConsistencyAction:[ |
|
4312 |
aClassOrNil isProjectDefinition ifTrue:[ |
|
4313 |
self validateConsistencyOfPackage:aClassOrNil package doClasses:false doExtensions:false. |
|
4314 |
] ifFalse:[ |
|
4315 |
self validateConsistencyOfPackage:aClassOrNil doClasses:false doExtensions:false. |
|
4316 |
]. |
|
4317 |
] |
|
4318 |
valuesInto:aBlock. |
|
4319 |
! |
|
4320 |
||
| 4201 | 4321 |
knownTagsInPackages:packages |
4322 |
"return the symbolic names given to any version in packages. |
|
4323 |
Being lazy, assume tags are persistent across packages (which they are not required to be...) |
|
4324 |
and only fetch the tag names from the first given package. |
|
4325 |
May raise an error, if the repository cannot be accessed" |
|
4326 |
||
4327 |
|someDfnClass| |
|
4328 |
||
| 4295 | 4329 |
someDfnClass := ProjectDefinition definitionClassForPackage:packages firstOrNil. |
| 4201 | 4330 |
someDfnClass isNil ifTrue:[ someDfnClass := Object projectDefinitionClass ]. |
4331 |
||
4332 |
^ (manager knownTagsFor:someDfnClass) asOrderedCollection sort. |
|
4333 |
||
4334 |
" |
|
4335 |
CVSSourceCodeManager utilities knownTagsInPackages:#( 'stx:libbasic' 'stc:libbasic2' ) |
|
4336 |
" |
|
4337 |
||
4338 |
"Created: / 04-02-2017 / 18:55:16 / cg" |
|
| 4295 | 4339 |
"Modified: / 29-12-2017 / 15:16:21 / stefan" |
| 4201 | 4340 |
! |
4341 |
||
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4342 |
removeSourceContainerForClass:aClass |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4343 |
"show container & let user confirm twice." |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4344 |
|
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4345 |
^ self removeSourceContainerForClass:aClass confirm:true warn:true |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4346 |
! |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4347 |
|
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4348 |
removeSourceContainerForClass:aClass confirm:doConfirm warn:doWarn |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4349 |
"show container & optionally let user confirm twice." |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4350 |
|
|
3814
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4351 |
|info mgr| |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4352 |
|
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4353 |
aClass isLoaded ifFalse:[ |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4354 |
doWarn ifTrue:[ |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4355 |
self warn:(resources string:'Please load the class first.'). |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4356 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4357 |
^ false. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4358 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4359 |
|
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4360 |
"/ |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4361 |
"/ ask the sourceCodeManager if it knows anything about that class |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4362 |
"/ if so, take that as a default. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4363 |
"/ |
| 1782 | 4364 |
mgr := self sourceCodeManagerFor:aClass. |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4365 |
mgr isNil ifTrue:[ |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4366 |
^ false |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4367 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4368 |
|
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4369 |
info := mgr sourceInfoOfClass:aClass. |
|
3814
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4370 |
^ self removeSourceContainerForClass:aClass usingSourceInfo:info confirm:doConfirm warn:doWarn |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4371 |
|
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4372 |
"Modified: / 16-07-2013 / 19:46:50 / cg" |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4373 |
! |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4374 |
|
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4375 |
removeSourceContainerForClass:aClass usingSourceInfo:info confirm:doConfirm warn:doWarn |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4376 |
"show container & optionally let user confirm twice." |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4377 |
|
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4378 |
|module directory fileName mgr| |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4379 |
|
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4380 |
aClass isLoaded ifFalse:[ |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4381 |
doWarn ifTrue:[ |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4382 |
self warn:(resources string:'Please load the class first.'). |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4383 |
]. |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4384 |
^ false. |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4385 |
]. |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4386 |
|
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4387 |
"/ |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4388 |
"/ ask the sourceCodeManager if it knows anything about that class |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4389 |
"/ if so, take that as a default. |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4390 |
"/ |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4391 |
mgr := self sourceCodeManagerFor:aClass. |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4392 |
mgr isNil ifTrue:[ |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4393 |
^ false |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4394 |
]. |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4395 |
|
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4396 |
info notNil ifTrue:[ |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4397 |
(info includesKey:#module) ifTrue:[ |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4398 |
module := (info at:#module). |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4399 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4400 |
(info includesKey:#directory) ifTrue:[ |
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
4401 |
directory := (info at:#directory). |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4402 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4403 |
fileName := mgr containerFromSourceInfo:info. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4404 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4405 |
|
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4406 |
module isNil ifTrue:[ |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4407 |
doWarn ifTrue:[ |
| 1423 | 4408 |
self warn:(resources stringWithCRs:'classes module is unknown.\\It seems to not have a container.') . |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4409 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4410 |
^ false. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4411 |
]. |
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
4412 |
directory isNil ifTrue:[ |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4413 |
doWarn ifTrue:[ |
| 1423 | 4414 |
self warn:(resources stringWithCRs:'classes package is unknown.\\It seems to not have a container.') . |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4415 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4416 |
^ false. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4417 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4418 |
fileName isNil ifTrue:[ |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4419 |
doWarn ifTrue:[ |
| 1423 | 4420 |
self warn:(resources stringWithCRs:'classes container fileName is unknown.\\It seems to not have a container.') . |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4421 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4422 |
^ false. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4423 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4424 |
|
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4425 |
OperatingSystem isMSDOSlike ifTrue:[ |
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
4426 |
"cvs expects unix-filenames" |
|
3591
d86841bb0d5c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3579
diff
changeset
|
4427 |
module := module asUnixFilenameString. |
|
d86841bb0d5c
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3579
diff
changeset
|
4428 |
directory := directory asUnixFilenameString. |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4429 |
]. |
| 1787 | 4430 |
(mgr checkForExistingContainer:fileName inModule:module directory:directory) ifFalse:[ |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4431 |
doWarn ifTrue:[ |
| 4447 | 4432 |
self warn:(resources stringWithCRs:'Class %1 had no source container (or SCM access is broken).' |
4433 |
with:aClass name) . |
|
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4434 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4435 |
^ false. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4436 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4437 |
|
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4438 |
doConfirm ifTrue:[ |
| 4447 | 4439 |
Dialog |
4440 |
modifyingBoxWith:[:box | |
|
4441 |
(YesToAllNotification notNil and:[YesToAllNotification isHandled]) ifTrue:[ |
|
4442 |
box |
|
4443 |
addButton:(Button label:'Remove All' |
|
4444 |
action:[YesToAllNotification queryWith:true. box hide. true]) |
|
4445 |
after:box noButton |
|
4446 |
]. |
|
4447 |
] |
|
4448 |
do:[ |
|
4449 |
(Dialog |
|
4450 |
choose:(resources |
|
4451 |
stringWithCRs:'Please confirm removal of the container for %1:\\container: %2 / %3 / %4\\Really remove ?' |
|
4452 |
with:aClass name |
|
4453 |
with:module |
|
4454 |
with:directory |
|
4455 |
with:fileName) |
|
4456 |
labels:(Array |
|
4457 |
with:(resources string:'No') |
|
4458 |
with:(resources string:'Remove')) |
|
4459 |
values:#(false true) |
|
4460 |
default:false) ifFalse:[ |
|
4461 |
^ false. |
|
4462 |
]. |
|
4463 |
]. |
|
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4464 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4465 |
|
|
3814
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4466 |
(mgr removeContainer:fileName inModule:module directory:directory) |
|
466fa886aa65
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3812
diff
changeset
|
4467 |
ifFalse:[ |
|
976
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4468 |
doWarn ifTrue:[ |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4469 |
self warn:(resources string:'failed to remove container.'). |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4470 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4471 |
^ true. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4472 |
]. |
|
cedcdc7e405c
utitity to remove a container
Claus Gittinger <cg@exept.de>
parents:
973
diff
changeset
|
4473 |
^ false |
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
4474 |
|
|
3351
68989ed1137f
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
4475 |
"Modified: / 16-07-2013 / 19:46:50 / cg" |
| 4447 | 4476 |
"Modified: / 23-06-2019 / 16:28:17 / Claus Gittinger" |
| 1000 | 4477 |
! |
4478 |
||
|
1026
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4479 |
repositoryLogOf:aClass onto:aStream |
|
2050
037e794f5857
+option to show a short revision log
Claus Gittinger <cg@exept.de>
parents:
2042
diff
changeset
|
4480 |
self repositoryLogOf:aClass short:false onto:aStream |
|
037e794f5857
+option to show a short revision log
Claus Gittinger <cg@exept.de>
parents:
2042
diff
changeset
|
4481 |
! |
|
037e794f5857
+option to show a short revision log
Claus Gittinger <cg@exept.de>
parents:
2042
diff
changeset
|
4482 |
|
|
037e794f5857
+option to show a short revision log
Claus Gittinger <cg@exept.de>
parents:
2042
diff
changeset
|
4483 |
repositoryLogOf:aClass short:shortOrNot onto:aStream |
|
1026
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4484 |
|info rv mgr info2 module fn msg s| |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4485 |
|
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4486 |
info := aClass revisionInfo. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4487 |
|
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4488 |
rv := aClass binaryRevision. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4489 |
rv notNil ifTrue:[ |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4490 |
aStream nextPutLine:'**** Loaded classes binary information ****'; cr. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4491 |
aStream nextPutLine:' Binary based upon : ' , rv. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4492 |
aStream cr. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4493 |
]. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4494 |
|
|
3344
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4495 |
"/ old |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4496 |
"/ info isNil ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4497 |
"/ aStream nextPutLine:'No revision info found'. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4498 |
"/ aClass isLoaded ifFalse:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4499 |
"/ aStream cr; nextPutAll:'This is an autoloaded class - you may see more after it is loaded.' |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4500 |
"/ ] ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4501 |
"/ fn := aClass classFilename. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4502 |
"/ aClass wasAutoloaded ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4503 |
"/ msg := 'This class was autoloaded.'. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4504 |
"/ msg := msg , ' (from ''' , fn , ''')'. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4505 |
"/ ] ifFalse:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4506 |
"/ msg := 'This class was loaded from ''' , fn , '''.' |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4507 |
"/ ]. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4508 |
"/ msg notNil ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4509 |
"/ aStream cr; nextPutAll:msg. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4510 |
"/ ] |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4511 |
"/ ]. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4512 |
"/ ^ self |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4513 |
"/ ] |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4514 |
|
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4515 |
info isNil ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4516 |
aClass isLoaded ifFalse:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4517 |
aStream nextPutLine:'This is an autoloaded class - you may see more after it is loaded.' |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4518 |
] ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4519 |
fn := aClass classFilename. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4520 |
aClass wasAutoloaded ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4521 |
msg := 'This class was autoloaded.'. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4522 |
msg := msg , ' (from ''' , fn , ''')'. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4523 |
] ifFalse:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4524 |
msg := 'This class was loaded from ''' , fn , '''.' |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4525 |
]. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4526 |
msg notNil ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4527 |
aStream nextPutLine:msg. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4528 |
] |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4529 |
]. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4530 |
aStream cr. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4531 |
] ifFalse:[ |
| 2041 | 4532 |
(info revision notNil) ifFalse:[ |
|
1026
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4533 |
aStream nextPutLine:'WARNING:'; cr. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4534 |
aStream nextPutLine:' The class seems not to be loaded from the repository.'. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4535 |
aStream nextPutLine:' Check carefully before checking anything in.'. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4536 |
aStream nextPutLine:' (i.e. compare with repository for renamed class(es), same-name but unrelated etc.)'. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4537 |
aStream cr. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4538 |
]. |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4539 |
|
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4540 |
aStream nextPutLine:'**** Classes source information ****'; cr. |
| 2042 | 4541 |
s := info repositoryPathName. |
|
1026
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4542 |
s notNil ifTrue:[ |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4543 |
aStream nextPutLine:' Source repository : ' , s |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4544 |
]. |
|
3676
51859e5df3b5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3674
diff
changeset
|
4545 |
aStream nextPutLine:(' Filename ........ : %1' bindWith: (info fileName ? '?')).
|
|
51859e5df3b5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3674
diff
changeset
|
4546 |
info symbolicVersionName ~= info revision ifTrue:[ |
|
51859e5df3b5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3674
diff
changeset
|
4547 |
aStream nextPutLine:(' Symbolic Version : %1' bindWith: (info symbolicVersionName ? '?')).
|
|
51859e5df3b5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3674
diff
changeset
|
4548 |
]. |
|
51859e5df3b5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3674
diff
changeset
|
4549 |
aStream nextPutLine:(' Revision ........ : %1' bindWith: (info revision ? '?')).
|
|
51859e5df3b5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3674
diff
changeset
|
4550 |
aStream nextPutLine:(' Checkin date .... : %1 %2 %3' bindWith: (info date ? '?')
|
|
51859e5df3b5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3674
diff
changeset
|
4551 |
with:(info time ? '?') |
|
51859e5df3b5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3674
diff
changeset
|
4552 |
with:(info timezone ? '')). |
|
51859e5df3b5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3674
diff
changeset
|
4553 |
aStream nextPutLine:(' Checkin user .... : %1' bindWith: (info user ? '?')).
|
|
3344
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4554 |
]. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4555 |
|
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4556 |
(info2 := aClass packageSourceCodeInfo) notNil ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4557 |
aStream nextPutLine:' Repository: ..... : ' , (info2 at:#module ifAbsent:'?'). |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4558 |
aStream nextPutLine:' Directory: ...... : ' , (info2 at:#directory ifAbsent:'?'). |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4559 |
]. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4560 |
info notNil ifTrue:[ |
| 2042 | 4561 |
aStream nextPutLine:' Container ....... : ' , (info repositoryPathName ? '?'). |
|
3344
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4562 |
]. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4563 |
aStream cr. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4564 |
mgr := self sourceCodeManagerFor:aClass. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4565 |
mgr notNil ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4566 |
aStream nextPutLine:'**** Repository information ****'; cr. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4567 |
|
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4568 |
module := nil. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4569 |
info2 notNil ifTrue:[ |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4570 |
module := info2 at:#module ifAbsent:nil. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4571 |
]. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4572 |
module notNil ifTrue:[ |
|
3632
c39f5d147a8b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3602
diff
changeset
|
4573 |
aStream nextPutLine:(' Repository URL ......: %1' bindWith:
|
|
3633
abe27fb2c473
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3632
diff
changeset
|
4574 |
((mgr repositoryNameForPackage:aClass package) ifNil:[mgr repositoryName , ' (default)']) asString). |
|
3344
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4575 |
]. |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
4576 |
mgr writeRevisionLogOf:aClass short:shortOrNot to:aStream. |
|
1026
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4577 |
] |
| 1782 | 4578 |
|
|
2836
91e9be94d80b
changed: #repositoryLogOf:short:onto:
Claus Gittinger <cg@exept.de>
parents:
2835
diff
changeset
|
4579 |
"Modified: / 12-10-2011 / 18:06:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
91e9be94d80b
changed: #repositoryLogOf:short:onto:
Claus Gittinger <cg@exept.de>
parents:
2835
diff
changeset
|
4580 |
"Modified: / 11-07-2012 / 13:50:59 / cg" |
| 1726 | 4581 |
! |
4582 |
||
4583 |
tagClass:aClass as:tag |
|
4584 |
|mgr| |
|
4585 |
||
4586 |
mgr := self sourceCodeManagerFor:aClass. |
|
| 4281 | 4587 |
mgr setSymbolicName:tag revision:nil overWrite:true class:aClass. |
| 1782 | 4588 |
|
4589 |
"Modified: / 12-09-2006 / 13:03:59 / cg" |
|
| 4281 | 4590 |
"Modified (format): / 05-12-2017 / 22:50:18 / cg" |
| 1782 | 4591 |
! |
4592 |
||
4593 |
tagClasses:aCollectionOfClasses as:tag |
|
|
3847
94661e33541c
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3818
diff
changeset
|
4594 |
^ self tagClasses:aCollectionOfClasses as:tag revision:nil |
|
94661e33541c
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3818
diff
changeset
|
4595 |
|
|
94661e33541c
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3818
diff
changeset
|
4596 |
"Created: / 12-09-2006 / 13:04:29 / cg" |
|
94661e33541c
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3818
diff
changeset
|
4597 |
! |
|
94661e33541c
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3818
diff
changeset
|
4598 |
|
|
94661e33541c
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3818
diff
changeset
|
4599 |
tagClasses:aCollectionOfClasses as:tag revision:revision |
| 1782 | 4600 |
|classesPerManager| |
4601 |
||
4602 |
classesPerManager := Dictionary new. |
|
| 4290 | 4603 |
aCollectionOfClasses do:[:eachClass | |
4604 |
|manager| |
|
4605 |
||
4606 |
manager := self sourceCodeManagerFor:eachClass. |
|
4607 |
(classesPerManager at:manager ifAbsentPut:[Set new]) add:eachClass |
|
4608 |
]. |
|
| 1782 | 4609 |
|
4610 |
classesPerManager keysAndValuesDo:[:manager :classesPerManager| |
|
| 4281 | 4611 |
manager setSymbolicName:tag revision:revision overWrite:true classes:classesPerManager. |
| 1782 | 4612 |
]. |
| 1726 | 4613 |
^ true |
| 4281 | 4614 |
|
| 4290 | 4615 |
"Modified (format): / 07-12-2017 / 10:48:36 / cg" |
| 1726 | 4616 |
! |
4617 |
||
| 2602 | 4618 |
tagPackage: package as:tag |
4619 |
self tagClasses:(Smalltalk allClassesInPackage:package) as:tag. |
|
| 4281 | 4620 |
"/ TODO: what about build support files and extensions??? |
| 2602 | 4621 |
|
4622 |
"Created: / 12-09-2006 / 13:04:29 / cg" |
|
4623 |
"Created: / 15-10-2011 / 22:47:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 4281 | 4624 |
"Modified (comment): / 05-12-2017 / 22:58:09 / cg" |
| 2602 | 4625 |
! |
4626 |
||
| 2691 | 4627 |
tagPath:aPath as:tag usingManager:aManager |
| 4281 | 4628 |
aManager setSymbolicName:tag revision:nil overWrite:true path:aPath. |
| 1782 | 4629 |
|
4630 |
"Modified: / 12-09-2006 / 12:04:44 / cg" |
|
| 2691 | 4631 |
"Created: / 29-12-2011 / 14:32:38 / cg" |
| 4281 | 4632 |
"Modified (format): / 05-12-2017 / 22:55:29 / cg" |
| 1375 | 4633 |
! ! |
4634 |
||
| 4226 | 4635 |
!SourceCodeManagerUtilities methodsFor:'utilities-scm-helpers'! |
| 1375 | 4636 |
|
4637 |
getMethodVersionsOfClass:aClass selector:selector numberOfRevisions:numberOfRevisionsOrNil |
|
4638 |
"check-out all previous versions of aClass and retrieve the history of selector. |
|
4639 |
Return a dictionary associating revision with a changeList entries for that method. |
|
4640 |
Unfinished - need a GUI for that." |
|
4641 |
||
4642 |
|mgr theClass revisionLog revisions items s entriesPerRevision previousVersion| |
|
4643 |
||
4644 |
theClass := aClass theNonMetaclass. |
|
4645 |
||
4646 |
mgr := self sourceCodeManagerFor:theClass. |
|
4647 |
mgr isNil ifTrue:[ |
|
4648 |
self error:'no sourceCodeManager'. |
|
4649 |
]. |
|
4650 |
||
4651 |
revisionLog := mgr |
|
4652 |
revisionLogOf:theClass |
|
4653 |
numberOfRevisions:numberOfRevisionsOrNil. |
|
4654 |
||
4655 |
revisions := revisionLog at:#revisions. |
|
4656 |
items := revisions collect:[:each | |rev date who| |
|
4657 |
rev := each at:#revision. |
|
4658 |
date := each at:#date. |
|
4659 |
who := each at:#author. |
|
4660 |
rev allBold , ' [' , date , ' by ' , who , ']' |
|
4661 |
]. |
|
4662 |
||
| 4349 | 4663 |
revisions := revisions collectColumn:#revision. |
| 1375 | 4664 |
revisions addFirst:#current. |
4665 |
entriesPerRevision := Dictionary new. |
|
4666 |
||
4667 |
previousVersion := nil. |
|
4668 |
revisions reverseDo:[:eachRevision | |
|
4669 |
|srcStream entries thisVersion| |
|
4670 |
||
4671 |
eachRevision == #current ifTrue:[ |
|
4672 |
s := '' writeStream. |
|
4673 |
theClass fileOutOn:s withTimeStamp:false. |
|
4674 |
srcStream := s contents readStream. |
|
4675 |
] ifFalse:[ |
|
4676 |
self activityNotification:('checking out revision ' , eachRevision , '...').
|
|
4677 |
srcStream := mgr getSourceStreamFor:theClass revision:eachRevision. |
|
4678 |
]. |
|
4679 |
||
4680 |
entries := ChangeSet fromStream:srcStream. |
|
4681 |
srcStream close. |
|
4682 |
||
4683 |
"/ remove all definitions |
|
4684 |
entries := entries select:[:each | each isMethodChange]. |
|
4685 |
"/ remove all methods which are for other selectors |
|
4686 |
entries := entries select:[:each | each selector == selector]. |
|
4687 |
"/ remove all methods which are for private subclasses |
|
4688 |
entries := entries select:[:each | each className = aClass name]. |
|
4689 |
||
4690 |
entries size == 1 ifTrue:[ |
|
4691 |
"/ the method is there |
|
4692 |
thisVersion := entries first. |
|
4693 |
(previousVersion notNil and:[previousVersion sameAs:thisVersion]) ifTrue:[ |
|
4694 |
"/ no change |
|
4695 |
] ifFalse:[ |
|
4696 |
entriesPerRevision at:eachRevision put:thisVersion. |
|
4697 |
]. |
|
4698 |
] ifFalse:[ |
|
4699 |
"/ the method is not there |
|
4700 |
]. |
|
4701 |
previousVersion := thisVersion. |
|
4702 |
]. |
|
4703 |
self error:'unfinished code'. |
|
4704 |
||
4705 |
" |
|
4706 |
self getMethodVersionsOfClass:MenuPanel selector:#'helpTextForItem:' numberOfRevisions:20 |
|
4707 |
self getMethodVersionsOfClass:NewLauncher class selector:#'menu' numberOfRevisions:20 |
|
4708 |
" |
|
| 4349 | 4709 |
|
4710 |
"Modified: / 22-09-2018 / 11:22:06 / Claus Gittinger" |
|
| 1375 | 4711 |
! ! |
4712 |
||
| 4226 | 4713 |
!SourceCodeManagerUtilities methodsFor:'utilities-scm-user interaction'! |
| 1375 | 4714 |
|
4715 |
askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName |
|
4716 |
"open a dialog asking for a source container; |
|
4717 |
return a dictionary containing module, package and filename, |
|
4718 |
or nil if canceled." |
|
4719 |
||
4720 |
^ self |
|
4721 |
askForContainer:boxText title:title note:notice |
|
4722 |
initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName |
|
4723 |
forNewContainer:true |
|
|
1026
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4724 |
! |
|
1f193eb5f877
common code (in Browser, NewBrowser) for revisionLogOf
Claus Gittinger <cg@exept.de>
parents:
1022
diff
changeset
|
4725 |
|
| 1375 | 4726 |
askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName forNewContainer:forNewContainer |
4727 |
"open a dialog asking for a source container; |
|
4728 |
return a dictionary containing module, package and filename, |
|
4729 |
or nil if canceled." |
|
4730 |
||
|
3551
e8feddd829f9
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3546
diff
changeset
|
4731 |
|box y component answer |
| 1375 | 4732 |
moduleHolder packageHolder fileNameHolder |
4733 |
module package fileName |
|
|
3202
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4734 |
allPackageIDs knownContainers knownPackages packageUpdater |
| 1375 | 4735 |
packageBoxComponent fileNameBoxComponent fileNameUpdater| |
4736 |
||
| 3967 | 4737 |
allPackageIDs := Smalltalk allPackageIDs. |
|
3202
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4738 |
|
|
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4739 |
knownContainers := allPackageIDs collect:[:package | (package upTo:$:)] as:Set. |
|
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4740 |
|
|
3394
8e7ee24c6e7b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3384
diff
changeset
|
4741 |
knownContainers := knownContainers asOrderedCollection reject:[:module | module isBlank]. |
| 1375 | 4742 |
knownContainers sort. |
4743 |
||
4744 |
packageUpdater := [ |
|
4745 |
|theModulePrefix| |
|
4746 |
||
4747 |
theModulePrefix := moduleHolder value , ':'. |
|
4748 |
||
4749 |
Cursor wait showWhile:[ |
|
|
3202
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4750 |
knownPackages := |
|
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4751 |
allPackageIDs |
|
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4752 |
select:[:package | (package startsWith:theModulePrefix)] |
|
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4753 |
thenCollect:[:package | |idx| |
|
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4754 |
idx := package indexOf:$:. |
|
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4755 |
(package copyFrom:idx + 1)]. |
|
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4756 |
|
|
b58b19cac708
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3201
diff
changeset
|
4757 |
knownPackages := knownPackages asSet asOrderedCollection. |
| 3291 | 4758 |
knownPackages := knownPackages reject:[:package | package isBlank]. |
| 1375 | 4759 |
knownPackages sort. |
4760 |
packageBoxComponent list:knownPackages. |
|
4761 |
]. |
|
4762 |
]. |
|
4763 |
||
4764 |
fileNameUpdater := [ |
|
4765 |
|module package files| |
|
4766 |
||
4767 |
Cursor read showWhile:[ |
|
|
2209
e3a4510c45f2
Project noProjectID -> PackageId noProjectID
Claus Gittinger <cg@exept.de>
parents:
2200
diff
changeset
|
4768 |
module := moduleHolder value ? (PackageId noProjectID). |
|
e3a4510c45f2
Project noProjectID -> PackageId noProjectID
Claus Gittinger <cg@exept.de>
parents:
2200
diff
changeset
|
4769 |
package := packageHolder value ? (PackageId noProjectID). |
| 1375 | 4770 |
|
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
4771 |
files := SourceCodeManager getExistingContainersInModule:module directory:package. |
| 1375 | 4772 |
files := files asOrderedCollection. |
4773 |
files := files select:[:eachFile | eachFile asFilename hasSuffix:'st']. |
|
4774 |
files sort. |
|
4775 |
fileNameBoxComponent list:files. |
|
4776 |
]. |
|
4777 |
]. |
|
4778 |
||
4779 |
moduleHolder := initialModule asValue. |
|
4780 |
packageHolder := initialPackage asValue. |
|
4781 |
fileNameHolder := initialFileName asValue. |
|
4782 |
||
4783 |
"/ |
|
4784 |
"/ open a dialog for this |
|
4785 |
"/ |
|
4786 |
box := DialogBox new. |
|
4787 |
box label:title. |
|
4788 |
||
|
3425
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4789 |
component := box addTextLabel:boxText withCRs adjust:#left. |
|
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4790 |
component borderWidth:0. |
| 1375 | 4791 |
box addVerticalSpace. |
4792 |
box addVerticalSpace. |
|
| 1000 | 4793 |
|
| 1375 | 4794 |
y := box yPosition. |
|
3425
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4795 |
component := box addTextLabel:(resources string:'Module:') adjust:#right. |
|
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4796 |
component width:0.4. |
| 1375 | 4797 |
box yPosition:y. |
4798 |
component := box addComboBoxOn:moduleHolder tabable:true. |
|
4799 |
component list:knownContainers. |
|
4800 |
||
4801 |
"/ component := box addInputFieldOn:moduleHolder tabable:true. |
|
4802 |
component width:0.6; left:0.4; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine. |
|
4803 |
||
4804 |
box addVerticalSpace. |
|
4805 |
y := box yPosition. |
|
|
3425
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4806 |
component := box addTextLabel:(resources string:'Package:') adjust:#right. |
|
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4807 |
component width:0.4. |
| 1375 | 4808 |
box yPosition:y. |
4809 |
packageBoxComponent := component := box addComboBoxOn:packageHolder tabable:true. |
|
4810 |
"/ component := box addInputFieldOn:packageHolder tabable:true. |
|
4811 |
component width:0.6; left:0.4; "immediateAccept:true; "acceptOnLeave:true; cursorMovementWhenUpdating:#beginOfLine. |
|
4812 |
packageUpdater value. |
|
4813 |
moduleHolder onChangeEvaluate:packageUpdater. |
|
4814 |
||
4815 |
box addVerticalSpace. |
|
4816 |
y := box yPosition. |
|
|
3425
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4817 |
component := box addTextLabel:(resources string:'Filename:') adjust:#right. |
|
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4818 |
component width:0.4. |
| 1375 | 4819 |
box yPosition:y. |
4820 |
||
4821 |
forNewContainer ifTrue:[ |
|
4822 |
component := box addInputFieldOn:fileNameHolder tabable:true. |
|
4823 |
component width:0.6; left:0.4; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine. |
|
4824 |
] ifFalse:[ |
|
4825 |
fileNameBoxComponent := component := box addComboBoxOn:fileNameHolder tabable:true. |
|
4826 |
component width:0.6; left:0.4; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine. |
|
4827 |
fileNameUpdater value. |
|
4828 |
packageHolder onChangeEvaluate:fileNameUpdater. |
|
4829 |
]. |
|
4830 |
||
4831 |
box addVerticalSpace. |
|
4832 |
||
4833 |
notice notNil ifTrue:[ |
|
|
3425
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4834 |
component := box addTextLabel:notice adjust:#left. |
|
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
4835 |
component borderWidth:0. |
| 1375 | 4836 |
]. |
4837 |
||
4838 |
box addVerticalSpace. |
|
4839 |
box addAbortAndOkButtons. |
|
4840 |
||
4841 |
(YesToAllNotification notNil and:[YesToAllNotification isHandled]) ifTrue:[ |
|
|
3683
fb6ad154b94d
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3679
diff
changeset
|
4842 |
component := Button label:(resources string:'Yes to All'). |
| 1375 | 4843 |
component action:[ |
4844 |
YesToAllNotification queryWith:true. |
|
4845 |
box doAccept. |
|
|
2253
7d7b0d2d1fe7
changed: #askForContainer:title:note:initialModule:initialPackage:initialFileName:forNewContainer:
Claus Gittinger <cg@exept.de>
parents:
2242
diff
changeset
|
4846 |
box okPressed. |
| 1375 | 4847 |
]. |
|
3394
8e7ee24c6e7b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3384
diff
changeset
|
4848 |
box addButton:component. |
| 1375 | 4849 |
]. |
4850 |
(AbortAllSignal isHandled) ifTrue:[ |
|
|
3683
fb6ad154b94d
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3679
diff
changeset
|
4851 |
component := Button label:(resources string:'Cancel All'). |
| 1375 | 4852 |
component action:[ |
4853 |
box hide. |
|
4854 |
AbortAllSignal raiseSignal. |
|
4855 |
]. |
|
|
3394
8e7ee24c6e7b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3384
diff
changeset
|
4856 |
box addButton:component before:nil. |
| 1375 | 4857 |
]. |
4858 |
||
4859 |
(YesToAllQuery notNil and:[YesToAllQuery isHandled]) ifTrue:[ |
|
4860 |
answer := YesToAllQuery query. |
|
4861 |
]. |
|
4862 |
||
4863 |
answer isNil ifTrue:[ |
|
4864 |
box showAtPointer. |
|
4865 |
answer := box accepted |
|
4866 |
]. |
|
4867 |
||
4868 |
box destroy. |
|
4869 |
answer ifFalse:[ |
|
4870 |
^ nil |
|
4871 |
]. |
|
| 1000 | 4872 |
|
| 1375 | 4873 |
module := moduleHolder value withoutSpaces. |
4874 |
package := packageHolder value withoutSpaces. |
|
4875 |
fileName := fileNameHolder value withoutSpaces. |
|
4876 |
^ Dictionary new |
|
4877 |
at:#module put:module; |
|
4878 |
at:#package put:package; |
|
4879 |
at:#fileName put:fileName; |
|
4880 |
yourself |
|
4881 |
||
4882 |
" |
|
4883 |
self |
|
4884 |
askForContainer:'enter container' title:'container' note:'some note' |
|
4885 |
initialModule:'foo' initialPackage:'bar' initialFileName:'baz' |
|
4886 |
" |
|
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
4887 |
|
|
3394
8e7ee24c6e7b
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3384
diff
changeset
|
4888 |
"Modified: / 29-08-2013 / 12:26:04 / cg" |
| 1375 | 4889 |
! |
4890 |
||
| 2570 | 4891 |
askForExistingRevision:boxText title:title class:aClass |
4892 |
"open a dialog asking for a containers revision; |
|
4893 |
return a revision number, or nil if canceled." |
|
4894 |
||
4895 |
|mgr sourceInfo module package fileName| |
|
4896 |
||
4897 |
mgr := self sourceCodeManagerFor:aClass. |
|
4898 |
sourceInfo := mgr sourceInfoOfClass:aClass. |
|
4899 |
sourceInfo isNil ifTrue:[^ nil]. |
|
4900 |
||
4901 |
package := mgr directoryFromSourceInfo:sourceInfo. |
|
4902 |
module := mgr moduleFromSourceInfo:sourceInfo. |
|
4903 |
fileName := mgr containerFromSourceInfo:sourceInfo. |
|
4904 |
^ self |
|
4905 |
askForExistingRevision:boxText |
|
4906 |
title:title |
|
4907 |
class:aClass |
|
4908 |
manager:mgr |
|
4909 |
module:module package:package |
|
4910 |
fileName:fileName |
|
4911 |
||
4912 |
" |
|
4913 |
SourceCodeManagerUtilities |
|
4914 |
askForRevisionToCompare:'enter revision' |
|
4915 |
title:'revision' |
|
4916 |
class:Array |
|
4917 |
" |
|
4918 |
||
4919 |
"Modified: / 12-09-2006 / 14:17:04 / cg" |
|
4920 |
! |
|
4921 |
||
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
4922 |
askForExistingRevision:boxText title:title class:clsOrNil manager:aSourceCodeManager module:module package:directory fileName:fileName |
| 1375 | 4923 |
"open a dialog asking for a containers revision; |
4924 |
return a revision number, or nil if canceled." |
|
4925 |
||
4926 |
|partialLog revisions items newestRev |
|
|
3551
e8feddd829f9
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3546
diff
changeset
|
4927 |
box y component revisionHolder symbolicNames stableRevision releasedRevision |
| 4287 | 4928 |
tagPlusRevisionHolder tagHolder tagList lockChange| |
| 2325 | 4929 |
|
| 1375 | 4930 |
partialLog := aSourceCodeManager |
4931 |
revisionLogOf:clsOrNil |
|
| 4287 | 4932 |
numberOfRevisions:30 |
| 1375 | 4933 |
fileName:fileName |
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
4934 |
directory:directory |
| 1375 | 4935 |
module:module. |
| 1522 | 4936 |
|
| 1375 | 4937 |
partialLog notNil ifTrue:[ |
4938 |
newestRev := partialLog at:#newestRevision. |
|
4939 |
revisions := partialLog at:#revisions. |
|
| 4287 | 4940 |
symbolicNames := partialLog at:#symbolicNames ifAbsent:[nil]. |
|
1456
673e4fc61c36
Tell about stable and released revisions
Stefan Vogel <sv@exept.de>
parents:
1449
diff
changeset
|
4941 |
symbolicNames notNil ifTrue:[ |
| 4287 | 4942 |
stableRevision := symbolicNames at:'stable' ifAbsent:[nil]. |
4943 |
releasedRevision := symbolicNames at:'released' ifAbsent:[nil]. |
|
4944 |
||
4945 |
"/ sort by revision; within same revision, sort by tag name |
|
4946 |
tagList := (((symbolicNames associations |
|
4947 |
sort:[:a :b | a key < b key "self versionString:(a value) isLessThan:(b value)"]) |
|
4948 |
stableSort:[:a :b | self versionString:(a value) isLessThan:(b value)]) |
|
4949 |
collect:[:assoc | assoc key]) reverse. |
|
4950 |
||
4951 |
stableRevision notNil ifTrue:[ |
|
4952 |
tagList remove:'stable'. |
|
4953 |
tagList notEmpty ifTrue:[ |
|
4954 |
tagList addFirst:'-' |
|
4955 |
]. |
|
4956 |
tagList addFirst:'stable'. |
|
4957 |
]. |
|
4958 |
||
4959 |
LastTag notEmptyOrNil ifTrue:[ |
|
| 4174 | 4960 |
tagList addFirst:LastTag. |
| 4287 | 4961 |
]. |
4962 |
tagList := tagList collect:[:tag | |
|
4963 |
|rev| |
|
4964 |
||
4965 |
rev := symbolicNames at:tag ifAbsent:[nil]. |
|
4966 |
rev isNil ifTrue:[ |
|
4967 |
tag |
|
4968 |
] ifFalse:[ |
|
| 4488 | 4969 |
tag,((' (', rev value, ')') allGray)
|
| 4287 | 4970 |
]. |
4971 |
]. |
|
|
1456
673e4fc61c36
Tell about stable and released revisions
Stefan Vogel <sv@exept.de>
parents:
1449
diff
changeset
|
4972 |
]. |
| 4007 | 4973 |
|
4974 |
"/ fill in timestamps |
|
4975 |
revisions do:[:each | |
|
| 4160 | 4976 |
|dateOrDateString timeOrTimeString timestampString timestamp| |
4977 |
||
4978 |
dateOrDateString := each at:#date ifAbsent:nil. |
|
4979 |
timeOrTimeString := each at:#time ifAbsent:nil. |
|
4980 |
dateOrDateString notNil ifTrue:[ |
|
4981 |
dateOrDateString isString ifTrue:[ |
|
4982 |
timestamp := Timestamp readFrom:dateOrDateString onError:nil. |
|
4983 |
timestamp notNil ifTrue:[ |
|
4984 |
each at:#timestamp put:timestamp. |
|
4985 |
]. |
|
4986 |
] ifFalse:[ |
|
4987 |
timeOrTimeString isString ifTrue:[ |
|
4988 |
self halt. |
|
4989 |
||
4990 |
] ifFalse:[ |
|
4991 |
(dateOrDateString notNil and:[timeOrTimeString notNil]) ifTrue:[ |
|
4992 |
timestamp := Timestamp fromDate:dateOrDateString andTime:timeOrTimeString. |
|
4993 |
each at:#timestamp put:timestamp. |
|
4994 |
] ifFalse:[ |
|
4995 |
self halt |
|
4996 |
] |
|
4997 |
] |
|
4998 |
]. |
|
| 4007 | 4999 |
]. |
5000 |
]. |
|
5001 |
||
5002 |
items := revisions |
|
5003 |
collectWithIndex:[:each :idx| |
|
| 4410 | 5004 |
|item rev timestamp date time dateAndTimeString who flag reason |
| 4007 | 5005 |
prevInfo prevDate nextInfo nextDate dateDifferentToPrev dateDifferentToNext| |
5006 |
||
5007 |
rev := each at:#revision. |
|
5008 |
||
5009 |
timestamp := each at:#timestamp. |
|
5010 |
timestamp notNil ifTrue:[ |
|
| 4410 | 5011 |
date := each at:#date. |
| 4007 | 5012 |
date = Date today ifTrue:[ |
5013 |
dateAndTimeString := timestamp asTime printString. |
|
5014 |
] ifFalse:[ |
|
5015 |
"/ if date is different to both previous AND next, |
|
5016 |
"/ only show the date |
|
5017 |
dateDifferentToPrev := dateDifferentToNext := false. |
|
5018 |
(idx > 1) ifTrue:[ |
|
5019 |
prevInfo := revisions at:idx-1. |
|
| 4410 | 5020 |
prevDate := prevInfo at:#date ifAbsent:nil. |
5021 |
dateDifferentToPrev := prevDate notNil and:[prevDate ~= date]. |
|
| 4007 | 5022 |
]. |
5023 |
(idx < revisions size) ifTrue:[ |
|
5024 |
nextInfo := revisions at:idx+1. |
|
| 4410 | 5025 |
nextDate := nextInfo at:#date ifAbsent:nil. |
5026 |
dateDifferentToNext := nextDate notNil and:[nextDate ~= date]. |
|
| 4007 | 5027 |
]. |
| 4410 | 5028 |
dateDifferentToPrev & dateDifferentToPrev ifTrue:[ |
| 4007 | 5029 |
dateAndTimeString := date printString. |
5030 |
] ifFalse:[ |
|
5031 |
dateAndTimeString := date printString,' ',(timestamp asTime printString). |
|
5032 |
] |
|
5033 |
]. |
|
5034 |
] ifFalse:[ |
|
5035 |
dateAndTimeString := (each at:#date ifAbsent:nil) ? '(unknown time)'. |
|
5036 |
]. |
|
5037 |
who := (each at:#author ifAbsent:nil) ? '?'. |
|
5038 |
rev = stableRevision ifTrue:[ |
|
5039 |
flag := ' Stable' allBold. |
|
5040 |
] ifFalse:[rev = releasedRevision ifTrue:[ |
|
5041 |
flag := ' Released' allBold. |
|
5042 |
] ifFalse:[ |
|
5043 |
flag := '' |
|
5044 |
]]. |
|
| 4410 | 5045 |
reason := each loggedReason. |
5046 |
item := '%1%2 [%3 by %4 (%5 %6)]' bindWith:rev allBold with:flag with:dateAndTimeString |
|
5047 |
with:who with:reason with:each changedLinesInfo. |
|
5048 |
reason = 'BUGFIX' ifTrue:[ |
|
| 4488 | 5049 |
item allRed |
| 4410 | 5050 |
] ifFalse:[reason = 'DOCUMENTATION' ifTrue:[ |
| 4488 | 5051 |
item allGray |
| 4410 | 5052 |
] ifFalse:[ |
5053 |
item |
|
5054 |
]] |
|
| 4007 | 5055 |
]. |
5056 |
||
| 4349 | 5057 |
revisions := revisions collectColumn:#revision. |
| 1375 | 5058 |
] ifFalse:[ |
|
1666
40429b90ebb6
renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents:
1533
diff
changeset
|
5059 |
newestRev := aSourceCodeManager newestRevisionInFile:fileName directory:directory module:module. |
| 1375 | 5060 |
revisions := items := nil. |
5061 |
||
5062 |
newestRev isNil ifTrue:[ |
|
| 4226 | 5063 |
(aSourceCodeManager checkForExistingContainer:fileName inModule:module directory:directory warn:true) |
| 1375 | 5064 |
ifFalse:[ |
5065 |
^ nil |
|
5066 |
] |
|
5067 |
] |
|
5068 |
]. |
|
| 2325 | 5069 |
|
5070 |
lockChange := false. |
|
5071 |
revisionHolder := newestRev asValue. |
|
| 1375 | 5072 |
revisionHolder onChangeEvaluate:[ |
5073 |
"/ cut off everything after revision |
|
| 2325 | 5074 |
|s first words tag| |
| 1375 | 5075 |
|
5076 |
s := revisionHolder value. |
|
5077 |
words := s asCollectionOfWords. |
|
5078 |
words size > 0 ifTrue:[ |
|
5079 |
first := words first string. |
|
5080 |
first ~= s ifTrue:[ |
|
5081 |
revisionHolder value:first |
|
5082 |
] |
|
| 2325 | 5083 |
]. |
5084 |
lockChange ifFalse:[ |
|
| 4287 | 5085 |
tagPlusRevisionHolder value:''. |
| 2325 | 5086 |
tagHolder value:'' |
5087 |
]. |
|
| 1375 | 5088 |
]. |
5089 |
||
| 2325 | 5090 |
tagHolder := '' asValue. |
5091 |
tagHolder |
|
5092 |
onChangeEvaluate:[ |
|
5093 |
|tag rev| |
|
5094 |
||
5095 |
(tag := tagHolder value) notEmptyOrNil ifTrue:[ |
|
| 4192 | 5096 |
"/ LastTag := tag. |
| 4287 | 5097 |
rev := symbolicNames at:tag ifAbsent:[nil]. |
5098 |
(rev notNil and:[rev ~= revisionHolder value]) ifTrue:[ |
|
| 2325 | 5099 |
lockChange := true. |
5100 |
revisionHolder value:rev. |
|
5101 |
lockChange := false. |
|
5102 |
]. |
|
5103 |
] |
|
5104 |
]. |
|
5105 |
||
| 4287 | 5106 |
tagPlusRevisionHolder := '' asValue. |
5107 |
tagPlusRevisionHolder |
|
5108 |
onChangeEvaluate:[ |
|
5109 |
|tagPlusRevision tag| |
|
5110 |
||
5111 |
(tagPlusRevision := tagPlusRevisionHolder value) notEmptyOrNil ifTrue:[ |
|
5112 |
tag := (tagPlusRevision string upTo:$( ) withoutSeparators. |
|
5113 |
tagHolder value:tag. |
|
5114 |
] |
|
5115 |
]. |
|
5116 |
||
| 1375 | 5117 |
"/ |
5118 |
"/ open a dialog for this |
|
5119 |
"/ |
|
5120 |
box := DialogBox new. |
|
5121 |
box label:title. |
|
5122 |
||
|
3425
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
5123 |
component := box addTextLabel:boxText withCRs adjust:#left. |
|
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
5124 |
component borderWidth:0. |
| 1375 | 5125 |
box addVerticalSpace. |
5126 |
box addVerticalSpace. |
|
5127 |
||
5128 |
y := box yPosition. |
|
|
3425
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
5129 |
component := box addTextLabel:(resources string:'Revision:') adjust:#right. |
|
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
5130 |
component width:0.4. |
| 1375 | 5131 |
box yPosition:y. |
5132 |
component := box addComboBoxOn:revisionHolder tabable:true. |
|
5133 |
component list:items. |
|
5134 |
component width:0.6; left:0.4; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine. |
|
5135 |
||
| 2325 | 5136 |
y := box yPosition. |
|
3425
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
5137 |
component := box addTextLabel:(resources string:'or Tag:') adjust:#right. |
|
05be11d262e2
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3394
diff
changeset
|
5138 |
component width:0.4. |
| 2325 | 5139 |
box yPosition:y. |
| 4287 | 5140 |
component := box addComboListOn:tagPlusRevisionHolder tabable:true. |
| 2325 | 5141 |
component list:tagList. |
5142 |
component width:0.6; left:0.4. |
|
5143 |
tagList isNil ifTrue:[ |
|
5144 |
component disable |
|
5145 |
]. |
|
5146 |
||
| 1375 | 5147 |
box addVerticalSpace. |
5148 |
||
5149 |
box addAbortAndOkButtons. |
|
5150 |
||
| 2325 | 5151 |
AbortAllOperationWantedQuery query ifTrue:[ |
| 4410 | 5152 |
(box addAbortButtonLabelled:'Cancel all') action:[AbortAllOperationRequest raise]. |
| 1375 | 5153 |
]. |
| 4192 | 5154 |
LastTag notEmptyOrNil ifTrue:[ |
| 4193 | 5155 |
(symbolicNames notNil and:[symbolicNames includesKey:LastTag]) ifTrue:[ |
5156 |
tagHolder value:LastTag. |
|
5157 |
]. |
|
| 4192 | 5158 |
]. |
5159 |
||
| 1375 | 5160 |
box showAtPointer. |
5161 |
||
5162 |
box accepted ifFalse:[ |
|
5163 |
box destroy. |
|
5164 |
^ nil |
|
5165 |
]. |
|
5166 |
box destroy. |
|
5167 |
||
| 4192 | 5168 |
LastTag := tagHolder value. |
5169 |
||
|
3865
b76ba0a9cf83
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3847
diff
changeset
|
5170 |
"/ it is not a good idea to return the tag-name here, |
|
b76ba0a9cf83
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3847
diff
changeset
|
5171 |
"/ because it may get cached later when the source is fetched, |
|
b76ba0a9cf83
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3847
diff
changeset
|
5172 |
"/ and the tag could move to another version (making the cached file invalid) |
|
b76ba0a9cf83
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3847
diff
changeset
|
5173 |
"/ without me knowing about that fact. |
|
b76ba0a9cf83
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3847
diff
changeset
|
5174 |
"/ Therefore, we should return the real revision number. |
|
b76ba0a9cf83
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3847
diff
changeset
|
5175 |
|
|
b76ba0a9cf83
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3847
diff
changeset
|
5176 |
"/ ouch: however, checkout of a branch seems to not work the same way |
|
b76ba0a9cf83
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3847
diff
changeset
|
5177 |
"/ so we DO return the tag, but suppress caching it. sigh. |
|
3551
e8feddd829f9
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3546
diff
changeset
|
5178 |
^ (tagHolder value notEmptyOrNil ifTrue:[tagHolder] ifFalse:[revisionHolder]) value withoutSpaces. |
|
3865
b76ba0a9cf83
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3847
diff
changeset
|
5179 |
"/ ^ revisionHolder value withoutSpaces. |
| 1375 | 5180 |
|
5181 |
" |
|
| 4287 | 5182 |
CVSSourceCodeManager utilities |
5183 |
askForExistingRevision:'enter revision' |
|
| 1375 | 5184 |
title:'revision' |
| 4287 | 5185 |
class:Array |
5186 |
manager:CVSSourceCodeManager |
|
| 1375 | 5187 |
module:'stx' |
| 4287 | 5188 |
package:'libbasic' |
5189 |
fileName:nil |
|
| 1375 | 5190 |
" |
| 1522 | 5191 |
|
| 4287 | 5192 |
"Modified: / 06-12-2017 / 12:30:32 / cg" |
| 4410 | 5193 |
"Modified: / 12-03-2019 / 11:46:34 / Stefan Vogel" |
| 4438 | 5194 |
"Modified: / 07-06-2019 / 22:13:30 / Claus Gittinger" |
| 1375 | 5195 |
! |
5196 |
||
| 1426 | 5197 |
checkAndWarnAboutBadMessagesInClass:aClass checkAgainHolder:checkAgainHolder |
| 1375 | 5198 |
"check if a class contains message-sends to: |
|
2237
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5199 |
#halt , #halt: |
| 1375 | 5200 |
#error |
|
2237
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5201 |
#todo , #todo: |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5202 |
(and maybe more in the future) |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5203 |
|
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5204 |
Only checks in non-extension methods - as this is only called when checking " |
| 1375 | 5205 |
|
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5206 |
|badStuff whatIsBad msg answer labels values defaultAnswer dontShowAgain |
|
3551
e8feddd829f9
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3546
diff
changeset
|
5207 |
methodsWithBadStuff| |
| 1375 | 5208 |
|
5209 |
badStuff := #( |
|
|
2237
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5210 |
( halt 'send of #halt (use for debugging only) - better use #error:''some message'' or #breakPoint:') |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5211 |
( halt: 'send of #halt: (use for debugging only) - better use #error: or #breakPoint:') |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5212 |
( error 'send of #error without descriptive message - better use #error:''some message''' ) |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5213 |
( todo 'send of #todo - unfinished code present?' ) |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5214 |
( todo: 'send of #todo:- unfinished code present?' ) |
| 1375 | 5215 |
). |
5216 |
||
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5217 |
methodsWithBadStuff := Set new. |
| 1375 | 5218 |
whatIsBad := Set new. |
5219 |
aClass theNonMetaclass instAndClassSelectorsAndMethodsDo:[:sel :mthd | |
|
|
2237
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5220 |
|setOfLiterals setOfSentMessages| |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5221 |
|
|
2977
e5bfe652373f
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2974
diff
changeset
|
5222 |
mthd isExtension ifFalse:[ |
|
2237
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5223 |
setOfLiterals := mthd literals. "/ try without parsing first. |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5224 |
(badStuff contains:[:eachEntry | setOfLiterals includes:eachEntry first]) ifTrue:[ |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5225 |
setOfSentMessages := mthd messagesSent. |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5226 |
badStuff do:[:eachEntry | |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5227 |
(setOfSentMessages includes:eachEntry first) ifTrue:[ |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5228 |
whatIsBad add:eachEntry second. |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5229 |
methodsWithBadStuff add:mthd. |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5230 |
] |
|
96105b41c6a6
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2236
diff
changeset
|
5231 |
]. |
| 1000 | 5232 |
]. |
5233 |
]. |
|
| 1375 | 5234 |
]. |
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5235 |
whatIsBad isEmpty ifTrue:[^ true]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5236 |
|
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5237 |
(YesToAllQuery notNil and:[YesToAllQuery isHandled]) ifTrue:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5238 |
answer := YesToAllQuery query. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5239 |
answer notNil ifTrue:[ ^ answer ]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5240 |
]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5241 |
|
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5242 |
msg := resources string:'%1 contains the following (considered bad style) message sends:' with:aClass name. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5243 |
msg := msg , '\\'. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5244 |
whatIsBad do:[:each | |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5245 |
msg := msg , ' ' , each , '\' |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5246 |
]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5247 |
msg := msg , '\'. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5248 |
methodsWithBadStuff size == 1 ifTrue:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5249 |
msg := msg , (resources string:'In %1.' |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5250 |
with:methodsWithBadStuff anElement whoString allBold). |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5251 |
] ifFalse:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5252 |
msg := msg , (resources string:'In %1 and %2 other methods.' |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5253 |
with:methodsWithBadStuff anElement whoString allBold |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5254 |
with:methodsWithBadStuff size-1). |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5255 |
]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5256 |
msg := msg , '\\' , (resources string:'Do you really want to checkIn the %1 class ?' with:aClass name). |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5257 |
|
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5258 |
(YesToAllNotification notNil and:[YesToAllNotification isHandled]) ifTrue:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5259 |
labels := #('Cancel All' 'Cancel' 'No to All' 'No' 'No, Browse' 'Yes to All' 'Yes') "#('Yes' 'Yes to All' 'No' 'No to All' 'Cancel')".
|
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5260 |
values := #(#cancelAll nil #noToAll #noBrowse false #yesToAll true) "#(true #yesToAll false #noToAll nil)". |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5261 |
defaultAnswer := #yesToAll. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5262 |
] ifFalse:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5263 |
labels := #('No' 'No, Browse' 'Yes').
|
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5264 |
values := #(false #noBrowse true). |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5265 |
defaultAnswer := true. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5266 |
]. |
| 1426 | 5267 |
|
|
1456
673e4fc61c36
Tell about stable and released revisions
Stefan Vogel <sv@exept.de>
parents:
1449
diff
changeset
|
5268 |
"/ AbortAllOperationRequest isHandled ifTrue:[ |
| 1426 | 5269 |
"/ labels := #('Cancel All') , labels.
|
5270 |
"/ values := #(#cancelAll) , values. |
|
5271 |
"/ ]. |
|
5272 |
||
|
3812
173678af0074
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3692
diff
changeset
|
5273 |
Dialog modifyingBoxWith:[:box | |
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5274 |
checkAgainHolder isValueModel ifTrue:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5275 |
dontShowAgain := checkAgainHolder value not asValue. |
|
3812
173678af0074
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3692
diff
changeset
|
5276 |
box addCheckBoxAtBottom:(resources string:'Do not show this Dialog again (reenable in Launcher).') |
|
2129
9d5c146df780
goodInitialLogMessageForCheckinClassOfClass:
Claus Gittinger <cg@exept.de>
parents:
2106
diff
changeset
|
5277 |
on:dontShowAgain. |
| 1426 | 5278 |
]. |
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5279 |
] do:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5280 |
answer := OptionBox |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5281 |
request:msg withCRs |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5282 |
label:(resources string:'Really CheckIn ?') |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5283 |
image:(InfoBox iconBitmap) |
|
3551
e8feddd829f9
class: SourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents:
3546
diff
changeset
|
5284 |
buttonLabels:(Dialog classResources array:labels) |
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5285 |
values:values |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5286 |
default:defaultAnswer |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5287 |
onCancel:nil. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5288 |
]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5289 |
answer isNil ifTrue:[ |
|
3433
eee3079d18d3
AbortSignal -> AbortOperationRequest
Stefan Vogel <sv@exept.de>
parents:
3425
diff
changeset
|
5290 |
AbortOperationRequest raise. |
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5291 |
]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5292 |
|
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5293 |
dontShowAgain notNil ifTrue:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5294 |
checkAgainHolder value:dontShowAgain value not |
| 1000 | 5295 |
]. |
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5296 |
|
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5297 |
answer == #noBrowse ifTrue:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5298 |
UserPreferences browserClass browseMethods:methodsWithBadStuff title:'Methods with Bad Stuff'. |
|
1995
f832f7ec6ccf
Don't use possibly uninitialized class variable
Stefan Vogel <sv@exept.de>
parents:
1994
diff
changeset
|
5299 |
self yesToAllNotification queryWith:false. |
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5300 |
^ false |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5301 |
]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5302 |
answer == #cancelAll ifTrue:[ |
|
3433
eee3079d18d3
AbortSignal -> AbortOperationRequest
Stefan Vogel <sv@exept.de>
parents:
3425
diff
changeset
|
5303 |
AbortOperationRequest raise. |
|
1994
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5304 |
]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5305 |
answer == #yesToAll ifTrue:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5306 |
YesToAllNotification queryWith:true. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5307 |
^ true |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5308 |
]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5309 |
answer == #noToAll ifTrue:[ |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5310 |
YesToAllNotification queryWith:false. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5311 |
^ false |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5312 |
]. |
|
eccaf18ff7a1
which method is bad - offer chance to browse them.
Claus Gittinger <cg@exept.de>
parents:
1988
diff
changeset
|
5313 |
^ answer |
| 1375 | 5314 |
|
5315 |
" |
|
5316 |
self checkAndWarnAboutBadMessagesInClass:(SourceCodeManagerUtilities) |
|
5317 |
" |
|
|
2775
d1908ae4aed8
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2774
diff
changeset
|
5318 |
|
|
d1908ae4aed8
changed: #checkAndWarnAboutBadMessagesInClass:checkAgainHolder:
Claus Gittinger <cg@exept.de>
parents:
2774
diff
changeset
|
5319 |
"Modified: / 28-02-2012 / 10:41:38 / cg" |
|
1460
2e1c304e5b52
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
1456
diff
changeset
|
5320 |
! |
|
2e1c304e5b52
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
1456
diff
changeset
|
5321 |
|
|
2129
9d5c146df780
goodInitialLogMessageForCheckinClassOfClass:
Claus Gittinger <cg@exept.de>
parents:
2106
diff
changeset
|
5322 |
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswerOrNil |
| 2283 | 5323 |
"ask for a log message for checking in a class (plus checkinQuick state info), |
5324 |
and other info (mark as stable, for example). |
|
5325 |
Return the info-object (actually: the dialog) or nil if aborted." |
|
|
1460
2e1c304e5b52
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
1456
diff
changeset
|
5326 |
|
| 1704 | 5327 |
^ self |
|
2129
9d5c146df780
goodInitialLogMessageForCheckinClassOfClass:
Claus Gittinger <cg@exept.de>
parents:
2106
diff
changeset
|
5328 |
getCheckinInfoFor:aClassNameOrPackageNameString |
| 1704 | 5329 |
initialAnswer:initialAnswerOrNil |
5330 |
withQuickOption:false |
|
5331 |
||
5332 |
" |
|
5333 |
SourceCodeManagerUtilities getCheckinInfoFor:'hello' initialAnswer:'bla' |
|
5334 |
" |
|
|
1460
2e1c304e5b52
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
1456
diff
changeset
|
5335 |
|
| 2283 | 5336 |
"Modified: / 06-07-2010 / 11:22:15 / cg" |
| 1704 | 5337 |
! |
5338 |
||
|
2129
9d5c146df780
goodInitialLogMessageForCheckinClassOfClass:
Claus Gittinger <cg@exept.de>
parents:
2106
diff
changeset
|
5339 |
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswerOrNil withQuickOption:withQuickOption |
| 2283 | 5340 |
"ask for a log message for checking in a class (plus checkinQuick state info), |
5341 |
and other info (mark as stable, for example). |
|
| 2106 | 5342 |
Return the info-object (actually: the dialog) or nil if aborted." |
5343 |
||
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5344 |
^ self |
| 4079 | 5345 |
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswerOrNil |
5346 |
withQuickOption:withQuickOption |
|
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5347 |
withValidateConsistencyOption:false |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5348 |
|
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5349 |
" |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5350 |
SourceCodeManagerUtilities default getCheckinInfoFor:'hello' initialAnswer:'bla' |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5351 |
" |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5352 |
|
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5353 |
"Modified: / 12-03-2012 / 13:12:40 / cg" |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5354 |
! |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5355 |
|
| 4272 | 5356 |
getCheckinInfoFor:infoString initialAnswer:initialAnswerOrNil withQuickOption:withQuickOption withValidateConsistencyOption:withValidateConsistencyOption |
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5357 |
"ask for a log message for checking in a class (plus checkinQuick state info), |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5358 |
and other info (mark as stable, for example). |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5359 |
Return the info-object (actually: the dialog) or nil if aborted." |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5360 |
|
| 4320 | 5361 |
^ self |
5362 |
getCheckinInfoFor:infoString initialAnswer:initialAnswerOrNil |
|
5363 |
withQuickOption:withQuickOption withValidateConsistencyOption:withValidateConsistencyOption |
|
5364 |
showChangesAction:nil |
|
5365 |
||
5366 |
" |
|
5367 |
SourceCodeManagerUtilities default getCheckinInfoFor:'hello' initialAnswer:'bla' |
|
5368 |
" |
|
5369 |
||
5370 |
"Modified: / 12-03-2012 / 13:12:40 / cg" |
|
5371 |
"Modified (format): / 04-12-2017 / 23:07:39 / cg" |
|
5372 |
! |
|
5373 |
||
5374 |
getCheckinInfoFor:infoString initialAnswer:initialAnswerOrNil |
|
5375 |
withQuickOption:withQuickOption withValidateConsistencyOption:withValidateConsistencyOption |
|
| 4490 | 5376 |
isClassCheckin:isClassCheckin |
5377 |
showChangesAction:showChangesActionOrNil |
|
5378 |
||
5379 |
"ask for a log message for checking in a class (plus checkinQuick state info), |
|
5380 |
and other info (mark as stable, for example). |
|
5381 |
Return the info-object (actually: the dialog) or nil if aborted." |
|
5382 |
||
5383 |
|logMsg infoDialog| |
|
5384 |
||
5385 |
infoDialog := Tools::CheckinInfoDialog new |
|
5386 |
showChangesAction:showChangesActionOrNil; |
|
5387 |
getCheckinInfoFor:infoString |
|
5388 |
initialAnswer:(initialAnswerOrNil ? LastSourceLogMessage) |
|
5389 |
withQuickOption:withQuickOption |
|
5390 |
isClassCheckin:isClassCheckin |
|
5391 |
logHistory:(LastSourceLogMessages ? #()) |
|
5392 |
withValidateConsistencyOption:withValidateConsistencyOption. |
|
5393 |
||
5394 |
infoDialog notNil ifTrue:[ |
|
5395 |
logMsg := infoDialog logMessage. |
|
5396 |
logMsg notEmptyOrNil ifTrue:[ |
|
5397 |
LastSourceLogMessage := logMsg. |
|
5398 |
LastSourceLogMessages isNil ifTrue:[ |
|
5399 |
LastSourceLogMessages := OrderedCollection new. |
|
5400 |
]. |
|
5401 |
LastSourceLogMessages remove:logMsg ifAbsent:[]. |
|
5402 |
LastSourceLogMessages addFirst:logMsg. |
|
5403 |
LastSourceLogMessages size > 10 ifTrue:[ |
|
5404 |
LastSourceLogMessages removeLast |
|
5405 |
]. |
|
5406 |
]. |
|
5407 |
]. |
|
5408 |
^ infoDialog |
|
5409 |
||
5410 |
" |
|
5411 |
SourceCodeManagerUtilities default getCheckinInfoFor:'hello' initialAnswer:'bla' |
|
5412 |
" |
|
5413 |
||
5414 |
"Modified: / 12-03-2012 / 13:12:40 / cg" |
|
5415 |
"Modified (format): / 04-12-2017 / 23:07:39 / cg" |
|
5416 |
! |
|
5417 |
||
5418 |
getCheckinInfoFor:infoString initialAnswer:initialAnswerOrNil |
|
5419 |
withQuickOption:withQuickOption withValidateConsistencyOption:withValidateConsistencyOption |
|
| 4320 | 5420 |
showChangesAction:showChangesActionOrNil |
5421 |
||
5422 |
"ask for a log message for checking in a class (plus checkinQuick state info), |
|
5423 |
and other info (mark as stable, for example). |
|
5424 |
Return the info-object (actually: the dialog) or nil if aborted." |
|
5425 |
||
| 2106 | 5426 |
|logMsg infoDialog| |
5427 |
||
| 4320 | 5428 |
infoDialog := Tools::CheckinInfoDialog new |
5429 |
showChangesAction:showChangesActionOrNil; |
|
| 4272 | 5430 |
getCheckinInfoFor:infoString |
| 2795 | 5431 |
initialAnswer:(initialAnswerOrNil ? LastSourceLogMessage) |
5432 |
withQuickOption:withQuickOption |
|
|
3140
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5433 |
logHistory:(LastSourceLogMessages ? #()) |
|
25a1a02ce3d9
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3134
diff
changeset
|
5434 |
withValidateConsistencyOption:withValidateConsistencyOption. |
| 2795 | 5435 |
|
| 2106 | 5436 |
infoDialog notNil ifTrue:[ |
5437 |
logMsg := infoDialog logMessage. |
|
| 2284 | 5438 |
logMsg notEmptyOrNil ifTrue:[ |
| 2795 | 5439 |
LastSourceLogMessage := logMsg. |
5440 |
LastSourceLogMessages isNil ifTrue:[ |
|
5441 |
LastSourceLogMessages := OrderedCollection new. |
|
5442 |
]. |
|
|
2796
78401b160a28
changed: #getCheckinInfoFor:initialAnswer:withQuickOption:
Claus Gittinger <cg@exept.de>
parents:
2795
diff
changeset
|
5443 |
LastSourceLogMessages remove:logMsg ifAbsent:[]. |
| 2795 | 5444 |
LastSourceLogMessages addFirst:logMsg. |
5445 |
LastSourceLogMessages size > 10 ifTrue:[ |
|
5446 |
LastSourceLogMessages removeLast |
|
5447 |
]. |
|
|
1460
2e1c304e5b52
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
1456
diff
changeset
|
5448 |
]. |
|
2e1c304e5b52
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
1456
diff
changeset
|
5449 |
]. |
| 2106 | 5450 |
^ infoDialog |
|
1460
2e1c304e5b52
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
1456
diff
changeset
|
5451 |
|
|
2e1c304e5b52
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
1456
diff
changeset
|
5452 |
" |
| 2795 | 5453 |
SourceCodeManagerUtilities default getCheckinInfoFor:'hello' initialAnswer:'bla' |
|
1460
2e1c304e5b52
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
1456
diff
changeset
|
5454 |
" |
| 1501 | 5455 |
|
|
2796
78401b160a28
changed: #getCheckinInfoFor:initialAnswer:withQuickOption:
Claus Gittinger <cg@exept.de>
parents:
2795
diff
changeset
|
5456 |
"Modified: / 12-03-2012 / 13:12:40 / cg" |
| 4272 | 5457 |
"Modified (format): / 04-12-2017 / 23:07:39 / cg" |
|
2129
9d5c146df780
goodInitialLogMessageForCheckinClassOfClass:
Claus Gittinger <cg@exept.de>
parents:
2106
diff
changeset
|
5458 |
! |
|
9d5c146df780
goodInitialLogMessageForCheckinClassOfClass:
Claus Gittinger <cg@exept.de>
parents:
2106
diff
changeset
|
5459 |
|
|
3344
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
5460 |
revisionForSymbolicName:tag class:cls fileName:classFileName directory:packageDir module:moduleDir manager:aSourceCodeManager |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
5461 |
"given a tag, return the corresponding revision" |
|
4e577aa5b998
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3343
diff
changeset
|
5462 |
|
| 4287 | 5463 |
^ aSourceCodeManager revisionForSymbolicName:tag class:cls fileName:classFileName directory:packageDir module:moduleDir |
5464 |
||
5465 |
" |
|
5466 |
CVSSourceCodeManager |
|
5467 |
revisionForSymbolicName:'stable' |
|
5468 |
class:Array fileName:'Array.st' |
|
5469 |
directory:'libbasic' module:'stx' |
|
5470 |
" |
|
5471 |
||
5472 |
"Modified (format): / 06-12-2017 / 11:45:12 / cg" |
|
| 1375 | 5473 |
! ! |
5474 |
||
| 873 | 5475 |
!SourceCodeManagerUtilities class methodsFor:'documentation'! |
5476 |
||
|
2487
c8f4417b9edc
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2484
diff
changeset
|
5477 |
version |
|
3892
3e7000585011
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3865
diff
changeset
|
5478 |
^ '$Header$' |
|
2487
c8f4417b9edc
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2484
diff
changeset
|
5479 |
! |
|
c8f4417b9edc
changed: #ensureCorrectVersionMethodsInClass:using:
Claus Gittinger <cg@exept.de>
parents:
2484
diff
changeset
|
5480 |
|
| 2175 | 5481 |
version_CVS |
|
3892
3e7000585011
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
3865
diff
changeset
|
5482 |
^ '$Header$' |
| 873 | 5483 |
! ! |
|
3134
93b8f75424c5
class: SourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents:
2977
diff
changeset
|
5484 |