|
2330
|
1 |
"{ Package: 'stx:libbasic3' }"
|
|
|
2 |
|
|
|
3 |
AbstractSourceCodeManager subclass:#PerforceSourceCodeManager
|
|
|
4 |
instanceVariableNames:''
|
|
|
5 |
classVariableNames:'PerforceExecutable PerforceModuleRoots PerforceClient
|
|
|
6 |
PerforcePort PerforceUser PerforcePassword PerforceTempDir
|
|
|
7 |
Verbose PerforceCommandSemaphore PerforceEnabled
|
|
|
8 |
PerforceCacheDirectoryName'
|
|
|
9 |
poolDictionaries:''
|
|
|
10 |
category:'System-SourceCodeManagement'
|
|
|
11 |
!
|
|
|
12 |
|
|
|
13 |
Object subclass:#CheckInDefinition
|
|
|
14 |
instanceVariableNames:'class packageDir classFileName sourceFileName force logMessage
|
|
|
15 |
moduleName manager tempDirectory workSpaceDefinition
|
|
|
16 |
newestRevision definitionClass'
|
|
|
17 |
classVariableNames:''
|
|
|
18 |
poolDictionaries:''
|
|
|
19 |
privateIn:PerforceSourceCodeManager
|
|
|
20 |
!
|
|
|
21 |
|
|
|
22 |
|
|
|
23 |
!PerforceSourceCodeManager class methodsFor:'initialization'!
|
|
|
24 |
|
|
|
25 |
forgetDisabledModules
|
|
|
26 |
^ self
|
|
|
27 |
!
|
|
|
28 |
|
|
|
29 |
initialize
|
|
|
30 |
|
|
|
31 |
PerforceCommandSemaphore := Semaphore new:10.
|
|
|
32 |
! !
|
|
|
33 |
|
|
|
34 |
!PerforceSourceCodeManager class methodsFor:'accessing'!
|
|
|
35 |
|
|
|
36 |
cacheDirectoryName
|
|
|
37 |
"return the name of the cache directory, where checked out class
|
|
|
38 |
sources are kept for faster access. The default is '/tmp/stx_sourceCache'.
|
|
|
39 |
This cache is shared among all ST/X users on a system."
|
|
|
40 |
|
|
|
41 |
^ PerforceCacheDirectoryName
|
|
|
42 |
|
|
|
43 |
"Modified: 12.9.1996 / 02:20:45 / cg"
|
|
|
44 |
!
|
|
|
45 |
|
|
|
46 |
cacheDirectoryName:aStringOrFilename
|
|
|
47 |
"set the name of the cache directory, where checked out class
|
|
|
48 |
sources are kept for faster access. The default is '/tmp/stx_sourceCache'.
|
|
|
49 |
This cache is shared among all ST/X users on a system.
|
|
|
50 |
The directory is typically set via the launchers setting menu, or
|
|
|
51 |
from a startup rc-file."
|
|
|
52 |
|
|
|
53 |
PerforceCacheDirectoryName := aStringOrFilename
|
|
|
54 |
|
|
|
55 |
"Created: 16.12.1995 / 15:18:43 / cg"
|
|
|
56 |
"Modified: 12.9.1996 / 02:21:35 / cg"
|
|
|
57 |
!
|
|
|
58 |
|
|
|
59 |
perforceClient
|
|
|
60 |
|envVar|
|
|
|
61 |
|
|
|
62 |
PerforceClient notNil ifTrue:[ ^ PerforceClient].
|
|
|
63 |
envVar := OperatingSystem getEnvironment:'P4CLIENT'.
|
|
|
64 |
envVar notEmptyOrNil ifTrue:[ ^ envVar].
|
|
|
65 |
^ 'workspace'
|
|
|
66 |
!
|
|
|
67 |
|
|
|
68 |
perforceClient:something
|
|
|
69 |
PerforceClient := something.
|
|
|
70 |
!
|
|
|
71 |
|
|
|
72 |
perforceEnabled
|
|
|
73 |
|
|
|
74 |
PerforceEnabled notNil ifTrue:[ ^ false].
|
|
|
75 |
^ PerforceEnabled
|
|
|
76 |
!
|
|
|
77 |
|
|
|
78 |
perforceEnabled:enable
|
|
|
79 |
|
|
|
80 |
PerforceEnabled := enable.
|
|
|
81 |
!
|
|
|
82 |
|
|
|
83 |
perforceExecutable
|
|
|
84 |
^ PerforceExecutable ? 'p4'
|
|
|
85 |
!
|
|
|
86 |
|
|
|
87 |
perforceExecutable:aString
|
|
|
88 |
"set the name of the cvs executable."
|
|
|
89 |
|
|
|
90 |
aString isEmptyOrNil ifTrue:[
|
|
|
91 |
PerforceExecutable := nil
|
|
|
92 |
] ifFalse:[
|
|
|
93 |
PerforceExecutable := aString.
|
|
|
94 |
].
|
|
|
95 |
|
|
|
96 |
"Created: / 21-09-2006 / 15:31:59 / cg"
|
|
|
97 |
"Modified: / 21-09-2006 / 16:41:33 / cg"
|
|
|
98 |
!
|
|
|
99 |
|
|
|
100 |
perforcePassword
|
|
|
101 |
|envVar|
|
|
|
102 |
|
|
|
103 |
PerforcePassword notNil ifTrue:[ ^ PerforcePassword].
|
|
|
104 |
envVar := OperatingSystem getEnvironment:'P4PASSWD'.
|
|
|
105 |
envVar notEmptyOrNil ifTrue:[ ^ envVar].
|
|
|
106 |
^ nil
|
|
|
107 |
!
|
|
|
108 |
|
|
|
109 |
perforcePassword:something
|
|
|
110 |
PerforcePassword := something.
|
|
|
111 |
!
|
|
|
112 |
|
|
|
113 |
perforcePort
|
|
|
114 |
|envVar|
|
|
|
115 |
|
|
|
116 |
PerforcePort notNil ifTrue:[ ^ PerforcePort].
|
|
|
117 |
envVar := OperatingSystem getEnvironment:'P4PORT'.
|
|
|
118 |
envVar notEmptyOrNil ifTrue:[ ^ envVar].
|
|
|
119 |
^ 'localhost:1666'
|
|
|
120 |
!
|
|
|
121 |
|
|
|
122 |
perforcePort:something
|
|
|
123 |
PerforcePort := something.
|
|
|
124 |
!
|
|
|
125 |
|
|
|
126 |
perforceUser
|
|
|
127 |
|envVar|
|
|
|
128 |
|
|
|
129 |
PerforceUser notNil ifTrue:[ ^ PerforceUser].
|
|
|
130 |
envVar := OperatingSystem getEnvironment:'P4USER'.
|
|
|
131 |
envVar notEmptyOrNil ifTrue:[ ^ envVar].
|
|
|
132 |
^ OperatingSystem getLoginName ? 'user'
|
|
|
133 |
!
|
|
|
134 |
|
|
|
135 |
perforceUser:something
|
|
|
136 |
PerforceUser := something.
|
|
|
137 |
!
|
|
|
138 |
|
|
|
139 |
repositoryInfoPerModule
|
|
|
140 |
"Superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
|
|
|
141 |
|
|
|
142 |
^ PerforceModuleRoots ? Dictionary new
|
|
|
143 |
!
|
|
|
144 |
|
|
|
145 |
repositoryInfoPerModule:aDictionary
|
|
|
146 |
"set the dictionary, which associates CVSRoots to module names.
|
|
|
147 |
If no entry is contained in this dictionary for some module,
|
|
|
148 |
the default cvsRoot (CVSRoot) will be used."
|
|
|
149 |
|
|
|
150 |
PerforceModuleRoots := aDictionary
|
|
|
151 |
!
|
|
|
152 |
|
|
|
153 |
repositoryName
|
|
|
154 |
"return the name of the repository.
|
|
|
155 |
Since this is an abstract class, return nil (i.e. none)"
|
|
|
156 |
|
|
|
157 |
^ (self perforceClient ,':',
|
|
|
158 |
self perforceUser, ':',
|
|
|
159 |
(self perforcePassword ? 'pass'), '@',
|
|
|
160 |
self perforcePort)
|
|
|
161 |
"Modified: 12.9.1996 / 02:20:45 / cg"
|
|
|
162 |
"Created: 14.9.1996 / 13:21:37 / cg"
|
|
|
163 |
!
|
|
|
164 |
|
|
|
165 |
repositoryName:settingsString
|
|
|
166 |
"return the name of the repository.
|
|
|
167 |
Since this is an abstract class, return nil (i.e. none)"
|
|
|
168 |
|
|
|
169 |
|settings|
|
|
|
170 |
|
|
|
171 |
settings := self getPerforceSettingsFromString:settingsString.
|
|
|
172 |
self perforceClient:(settings at:#client ifAbsent:nil).
|
|
|
173 |
self perforceUser:(settings at:#user ifAbsent:nil).
|
|
|
174 |
self perforcePassword:(settings at:#password ifAbsent:nil).
|
|
|
175 |
self perforcePort:(settings at:#port ifAbsent:nil).
|
|
|
176 |
"Modified: 12.9.1996 / 02:20:45 / cg"
|
|
|
177 |
"Created: 14.9.1996 / 13:21:37 / cg"
|
|
|
178 |
!
|
|
|
179 |
|
|
|
180 |
repositoryNameForModule:aModuleName
|
|
|
181 |
|
|
|
182 |
|settings|
|
|
|
183 |
|
|
|
184 |
settings := self getPerforceSettingsForModule:aModuleName.
|
|
|
185 |
settings isNil ifTrue:[ ^ ''].
|
|
|
186 |
^ ((settings at:#client ifAbsent:'') ,':',
|
|
|
187 |
(settings at:#user ifAbsent:''), ':',
|
|
|
188 |
(settings at:#password ifAbsent:''), '@',
|
|
|
189 |
(settings at:#port ifAbsent:''))
|
|
|
190 |
! !
|
|
|
191 |
|
|
|
192 |
!PerforceSourceCodeManager class methodsFor:'basic access'!
|
|
|
193 |
|
|
|
194 |
checkoutModule:aModule directory:aPackage andDo:aBlock
|
|
|
195 |
"check out everything from a package into a temporary directory.
|
|
|
196 |
Then evaluate aBlock, passing the name of that temp-directory.
|
|
|
197 |
Afterwards, the tempDir is removed.
|
|
|
198 |
Return true, if OK, false if any error occurred."
|
|
|
199 |
|
|
|
200 |
self shouldImplement
|
|
|
201 |
!
|
|
|
202 |
|
|
|
203 |
createTempDirectory:packageDir forModule:moduleDir
|
|
|
204 |
"create a temp directory for checking out"
|
|
|
205 |
|
|
|
206 |
|tempdir dir|
|
|
|
207 |
|
|
|
208 |
"/ if CVSTempDir isNil, use current.
|
|
|
209 |
OperatingSystem errorSignal handle:[:ex |
|
|
|
210 |
self reportError:('cannot create temporary directory').
|
|
|
211 |
^ nil.
|
|
|
212 |
] do:[
|
|
|
213 |
tempdir := Filename newTemporaryDirectoryIn:(self perforceTmpDirectory).
|
|
|
214 |
].
|
|
|
215 |
|
|
|
216 |
moduleDir notNil ifTrue:[
|
|
|
217 |
dir := tempdir construct:moduleDir.
|
|
|
218 |
dir makeDirectory.
|
|
|
219 |
|
|
|
220 |
packageDir notNil ifTrue:[
|
|
|
221 |
dir := dir construct:packageDir.
|
|
|
222 |
dir recursiveMakeDirectory.
|
|
|
223 |
].
|
|
|
224 |
dir exists ifFalse:[
|
|
|
225 |
(tempdir construct:moduleDir) recursiveRemove.
|
|
|
226 |
tempdir recursiveRemove.
|
|
|
227 |
self reportError:('cannot create temporary directory').
|
|
|
228 |
^ nil.
|
|
|
229 |
].
|
|
|
230 |
].
|
|
|
231 |
^ tempdir
|
|
|
232 |
|
|
|
233 |
"self createTempDirectory:'fooPackage' forModule:'fooModule'"
|
|
|
234 |
|
|
|
235 |
"Created: / 09-12-1995 / 19:14:35 / cg"
|
|
|
236 |
"Modified: / 19-12-1995 / 16:13:02 / stefan"
|
|
|
237 |
"Modified: / 29-08-2006 / 13:16:23 / cg"
|
|
|
238 |
!
|
|
|
239 |
|
|
|
240 |
savePreferencesOn:aStream
|
|
|
241 |
aStream nextPutLine:' PerforceSourceCodeManager notNil ifTrue:['.
|
|
|
242 |
aStream nextPutLine:' PerforceSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
|
|
|
243 |
PerforceExecutable notNil ifTrue:[
|
|
|
244 |
aStream nextPutLine:' PerforceSourceCodeManager perforceExecutable:' , PerforceExecutable storeString , '.'.
|
|
|
245 |
].
|
|
|
246 |
(Smalltalk at:#SourceCodeManager) == self ifTrue:[
|
|
|
247 |
aStream nextPutLine:' Smalltalk at:#SourceCodeManager put: PerforceSourceCodeManager.'.
|
|
|
248 |
aStream nextPutLine:' PerforceSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
|
|
|
249 |
].
|
|
|
250 |
aStream nextPutLine:' ].'.
|
|
|
251 |
|
|
|
252 |
"Created: / 09-11-2006 / 15:09:25 / cg"
|
|
|
253 |
"Modified: / 10-11-2006 / 18:14:16 / cg"
|
|
|
254 |
!
|
|
|
255 |
|
|
|
256 |
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:doCache
|
|
|
257 |
"extract a classes source code and return an open readStream on it.
|
|
|
258 |
A revision of nil selects the current (in image) revision.
|
|
|
259 |
The classes source code is extracted using the revision and the sourceCodeInfo,
|
|
|
260 |
which itself is extracted from the classes packageString."
|
|
|
261 |
|
|
|
262 |
|cacheIt cacheDir classFileName fullName cachedSourceFilename cacheSubDir cachedFile tempdir checkoutName
|
|
|
263 |
checkoutNameLocal revisionArg revMsg fullTempName fullCachedName stream tempFile cmd inDirectory inStream outStream
|
|
|
264 |
line modulDir lineNr result|
|
|
|
265 |
|
|
|
266 |
cacheIt := doCache.
|
|
|
267 |
(cacheIt and:[revision ~~ #newest and:[revision notNil]]) ifTrue:[
|
|
|
268 |
(cacheDir := self sourceCacheDirectory) isNil ifTrue:[
|
|
|
269 |
'PerforceSourceCodeManager [warning]: no source cache directory' errorPrintCR.
|
|
|
270 |
]
|
|
|
271 |
].
|
|
|
272 |
|
|
|
273 |
classFileName := fileName.
|
|
|
274 |
classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
|
|
|
275 |
|
|
|
276 |
(classFileName endsWith:',v') ifTrue:[
|
|
|
277 |
classFileName := classFileName copyWithoutLast:2.
|
|
|
278 |
].
|
|
|
279 |
(classFileName endsWith:'.st') ifTrue:[
|
|
|
280 |
cls notNil ifTrue:[
|
|
|
281 |
classFileName := classFileName copyWithoutLast:3.
|
|
|
282 |
]
|
|
|
283 |
].
|
|
|
284 |
fullName := moduleDir , '/' , packageDir , '/' , classFileName.
|
|
|
285 |
cls notNil ifTrue:[
|
|
|
286 |
fullName := fullName , '.st'.
|
|
|
287 |
].
|
|
|
288 |
|
|
|
289 |
(revision isNil or:[revision == #newest]) ifTrue:[
|
|
|
290 |
cachedSourceFilename := classFileName.
|
|
|
291 |
] ifFalse:[
|
|
|
292 |
cachedSourceFilename := classFileName , '_' , revision.
|
|
|
293 |
].
|
|
|
294 |
|
|
|
295 |
cacheDir notNil ifTrue:[
|
|
|
296 |
cacheSubDir := cacheDir construct:moduleDir.
|
|
|
297 |
cacheSubDir exists ifTrue:[
|
|
|
298 |
cacheSubDir := cacheSubDir construct:packageDir.
|
|
|
299 |
cacheSubDir exists ifTrue:[
|
|
|
300 |
cachedFile := cacheSubDir construct:cachedSourceFilename.
|
|
|
301 |
cachedFile exists ifTrue:[
|
|
|
302 |
^ cachedFile readStream
|
|
|
303 |
].
|
|
|
304 |
].
|
|
|
305 |
].
|
|
|
306 |
].
|
|
|
307 |
|
|
|
308 |
"/
|
|
|
309 |
"/ first, create a temporary work tree
|
|
|
310 |
"/ Do not make module and package directories, their existence cause cvs checkout to fail in server mode
|
|
|
311 |
"/
|
|
|
312 |
tempdir := self createTempDirectory:nil forModule:nil.
|
|
|
313 |
|
|
|
314 |
|
|
|
315 |
"/
|
|
|
316 |
"/ check it out there
|
|
|
317 |
"/
|
|
|
318 |
checkoutName := fullName.
|
|
|
319 |
|
|
|
320 |
modulDir := moduleDir asFilename construct:packageDir.
|
|
|
321 |
checkoutNameLocal := modulDir constructString:(fullName asFilename baseName).
|
|
|
322 |
|
|
|
323 |
(revision isNil or:[revision == #newest]) ifTrue:[
|
|
|
324 |
cachedSourceFilename := classFileName.
|
|
|
325 |
revisionArg := ''.
|
|
|
326 |
revMsg := ''.
|
|
|
327 |
] ifFalse:[
|
|
|
328 |
cachedSourceFilename := classFileName , '_' , revision.
|
|
|
329 |
revisionArg := ' -r ' , revision.
|
|
|
330 |
revMsg := ' (' , revision , ')'.
|
|
|
331 |
].
|
|
|
332 |
self activityNotification:'checking out source ' , checkoutName , revMsg.
|
|
|
333 |
|
|
|
334 |
fullTempName := tempdir construct:checkoutNameLocal.
|
|
|
335 |
cmd := ('print ' , classFileName, '.st#', revision).
|
|
|
336 |
|
|
|
337 |
inDirectory := (Filename currentDirectory asAbsoluteFilename construct:modulDir) pathName.
|
|
|
338 |
result := self executePerforceCommand:cmd
|
|
|
339 |
module:moduleDir
|
|
|
340 |
inDirectory:inDirectory
|
|
|
341 |
log:false
|
|
|
342 |
pipe:false.
|
|
|
343 |
result ifFalse:[
|
|
|
344 |
('PerforceSourceCodeManager [error]: error execute command ', cmd) errorPrintCR.
|
|
|
345 |
^ nil
|
|
|
346 |
].
|
|
|
347 |
inStream := self executePerforceCommand:cmd
|
|
|
348 |
module:moduleDir
|
|
|
349 |
inDirectory:inDirectory
|
|
|
350 |
log:true
|
|
|
351 |
pipe:true.
|
|
|
352 |
|
|
|
353 |
inStream isNil ifTrue:[
|
|
|
354 |
('PerforceSourceCodeManager [error]: could not get Stream from ', cmd) errorPrintCR.
|
|
|
355 |
^ nil
|
|
|
356 |
].
|
|
|
357 |
FileStream openErrorSignal handle:[:ex|
|
|
|
358 |
('PerforceSourceCodeManager [error]: can not create ', fullTempName pathName) errorPrintCR.
|
|
|
359 |
^ nil.
|
|
|
360 |
] do:[
|
|
|
361 |
fullTempName directory recursiveMakeDirectory.
|
|
|
362 |
outStream := fullTempName writeStream.
|
|
|
363 |
].
|
|
|
364 |
lineNr := 1.
|
|
|
365 |
[inStream atEnd not] whileTrue:[
|
|
|
366 |
line:= inStream nextLine.
|
|
|
367 |
line notNil ifTrue:[
|
|
|
368 |
lineNr = 1 ifTrue:[
|
|
|
369 |
] ifFalse:[
|
|
|
370 |
outStream nextPutLine:line.
|
|
|
371 |
].
|
|
|
372 |
].
|
|
|
373 |
lineNr := lineNr + 1.
|
|
|
374 |
].
|
|
|
375 |
outStream close.
|
|
|
376 |
|
|
|
377 |
(cacheSubDir isNil) ifTrue:[
|
|
|
378 |
cacheIt := false
|
|
|
379 |
] ifFalse:[
|
|
|
380 |
cacheSubDir recursiveMakeDirectory.
|
|
|
381 |
fullCachedName := cacheSubDir constructString:cachedSourceFilename.
|
|
|
382 |
].
|
|
|
383 |
fullTempName exists ifFalse:[
|
|
|
384 |
('PerforceSourceCodeManager [error]: failed to checkout ', fullTempName pathName, ' (file does not exist after cvs co)') errorPrintCR.
|
|
|
385 |
tempdir recursiveRemove.
|
|
|
386 |
^ nil
|
|
|
387 |
].
|
|
|
388 |
|
|
|
389 |
(cacheIt
|
|
|
390 |
and:[cachedFile notNil
|
|
|
391 |
and:[fullTempName exists]])
|
|
|
392 |
ifTrue:[
|
|
|
393 |
(OperatingSystem errorSignal catch:[
|
|
|
394 |
fullTempName moveTo:fullCachedName
|
|
|
395 |
]) ifTrue:[
|
|
|
396 |
('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
|
|
|
397 |
tempdir recursiveRemove.
|
|
|
398 |
^ nil
|
|
|
399 |
].
|
|
|
400 |
fullCachedName asFilename exists ifTrue:[
|
|
|
401 |
stream := fullCachedName asFilename readStream.
|
|
|
402 |
].
|
|
|
403 |
] ifFalse:[
|
|
|
404 |
OperatingSystem isUNIXlike ifFalse:[
|
|
|
405 |
"/ cannot remove files which are still open ...
|
|
|
406 |
"/ sigh - need a delete-on-close flag in FileStream.
|
|
|
407 |
"/
|
|
|
408 |
tempFile := Filename newTemporary.
|
|
|
409 |
fullTempName copyTo:tempFile.
|
|
|
410 |
stream := tempFile readStream.
|
|
|
411 |
stream notNil ifTrue:[
|
|
|
412 |
stream removeOnClose:true.
|
|
|
413 |
].
|
|
|
414 |
] ifTrue:[
|
|
|
415 |
stream := fullTempName readStream.
|
|
|
416 |
]
|
|
|
417 |
].
|
|
|
418 |
|
|
|
419 |
^ stream
|
|
|
420 |
! !
|
|
|
421 |
|
|
|
422 |
!PerforceSourceCodeManager class methodsFor:'basic administration'!
|
|
|
423 |
|
|
|
424 |
checkForExistingContainer:fileName inModule:moduleDir directory:packageDir
|
|
|
425 |
"check for a container to exist"
|
|
|
426 |
|
|
|
427 |
|newestRevision class className|
|
|
|
428 |
|
|
|
429 |
fileName isString ifTrue:[
|
|
|
430 |
className := fileName asFilename withoutSuffix baseName.
|
|
|
431 |
class := Smalltalk at:(className asSymbol).
|
|
|
432 |
] ifFalse:[
|
|
|
433 |
class := fileName.
|
|
|
434 |
].
|
|
|
435 |
newestRevision := self newestRevisionOf:class.
|
|
|
436 |
^ newestRevision notNil
|
|
|
437 |
!
|
|
|
438 |
|
|
|
439 |
checkForExistingModule:moduleName
|
|
|
440 |
"check for a module directory to be present"
|
|
|
441 |
|
|
|
442 |
|workSpaceDefinition|
|
|
|
443 |
|
|
|
444 |
workSpaceDefinition := self getWorkSpaceForModule:moduleName modulePath:nil.
|
|
|
445 |
|
|
|
446 |
^ workSpaceDefinition notNil.
|
|
|
447 |
|
|
|
448 |
|
|
|
449 |
"
|
|
|
450 |
self checkForExistingModule:'applistx'
|
|
|
451 |
self checkForExistingModule:'balla'
|
|
|
452 |
"
|
|
|
453 |
!
|
|
|
454 |
|
|
|
455 |
checkForExistingModule:moduleName directory:packageDir
|
|
|
456 |
"check for a package directory to be present"
|
|
|
457 |
|
|
|
458 |
|modulePath cmd inDirectory inStream line workSpaceDefinition repositoryDir|
|
|
|
459 |
|
|
|
460 |
modulePath := moduleName , '/' , packageDir.
|
|
|
461 |
|
|
|
462 |
inDirectory := (Filename currentDirectory asAbsoluteFilename) pathName.
|
|
|
463 |
workSpaceDefinition := self getWorkSpaceForModule:moduleName modulePath:modulePath.
|
|
|
464 |
workSpaceDefinition isNil ifTrue:[
|
|
|
465 |
('PerforceSourceCodeManager [error]: cant get perforce client info for ', moduleName) errorPrintCR.
|
|
|
466 |
^ false
|
|
|
467 |
].
|
|
|
468 |
repositoryDir := workSpaceDefinition at:#repositoryDir.
|
|
|
469 |
(repositoryDir endsWith:'...') ifTrue:[
|
|
|
470 |
repositoryDir := repositoryDir copyTo:(repositoryDir size - 3).
|
|
|
471 |
].
|
|
|
472 |
cmd := ('sync ' , repositoryDir, modulePath, '/...').
|
|
|
473 |
inStream := self executePerforceCommand:cmd
|
|
|
474 |
module:moduleName
|
|
|
475 |
inDirectory:inDirectory
|
|
|
476 |
log:true
|
|
|
477 |
pipe:true.
|
|
|
478 |
inStream isNil ifTrue:[
|
|
|
479 |
('PerforceSourceCodeManager [error]: cannot open pipe to perforce sync ', moduleName) errorPrintCR.
|
|
|
480 |
^ false
|
|
|
481 |
].
|
|
|
482 |
|
|
|
483 |
"/
|
|
|
484 |
"/ read the commands pipe output and extract the container info
|
|
|
485 |
"/
|
|
|
486 |
[inStream atEnd not] whileTrue:[
|
|
|
487 |
line:= inStream nextLine.
|
|
|
488 |
line notNil ifTrue:[
|
|
|
489 |
(line endsWith:'no such file(s).') ifTrue:[
|
|
|
490 |
^ false
|
|
|
491 |
].
|
|
|
492 |
]
|
|
|
493 |
].
|
|
|
494 |
^ true
|
|
|
495 |
|
|
|
496 |
"
|
|
|
497 |
self checkForExistingModule:'testModule' directory:'libTestPerforce'
|
|
|
498 |
"
|
|
|
499 |
!
|
|
|
500 |
|
|
|
501 |
checkinClass:cls fileName:classFileName directory:packageDir module:moduleName logMessage:logMessage force:forceArg
|
|
|
502 |
"enter a classes source code
|
|
|
503 |
into the source repository. If the force argument is true, no merge is done;
|
|
|
504 |
instead, the code is checked in as given (Dangerous).
|
|
|
505 |
Return true if ok, false if not."
|
|
|
506 |
|
|
|
507 |
|tempdir cmd checkoutName logMsg locRevision newestRevision binRevision modulePath newVersionString
|
|
|
508 |
workspaceDefinitionFile workSpaceName result checkInDefinition workSpaceDefinition depotRoot|
|
|
|
509 |
|
|
|
510 |
cls isPrivate ifTrue:[
|
|
|
511 |
self reportError:'refuse to check in private classes.'.
|
|
|
512 |
^ false.
|
|
|
513 |
].
|
|
|
514 |
checkInDefinition := CheckInDefinition new.
|
|
|
515 |
checkInDefinition definitionClass:cls.
|
|
|
516 |
checkInDefinition classFileName:classFileName.
|
|
|
517 |
checkInDefinition force:forceArg.
|
|
|
518 |
checkInDefinition moduleName:moduleName.
|
|
|
519 |
checkInDefinition packageDir:packageDir.
|
|
|
520 |
checkInDefinition manager:self.
|
|
|
521 |
(checkInDefinition setLogMessage:logMessage) ifFalse:[
|
|
|
522 |
self reportError:'perforce cannot handle unicode in logMessage'.
|
|
|
523 |
^ false
|
|
|
524 |
].
|
|
|
525 |
|
|
|
526 |
|
|
|
527 |
locRevision := checkInDefinition getLocalRevisionNumber.
|
|
|
528 |
(binRevision := checkInDefinition getBinaryRevisionNumber) notNil ifTrue:[
|
|
|
529 |
locRevision ~= binRevision ifTrue:[
|
|
|
530 |
('PerforceSourceCodeManager [info]: class ' , checkInDefinition className , ' is based upon ' , binRevision printString, ' but has revision ' , (locRevision printString ? '?')) infoPrintCR
|
|
|
531 |
]
|
|
|
532 |
].
|
|
|
533 |
|
|
|
534 |
locRevision isNil ifTrue:[
|
|
|
535 |
locRevision := checkInDefinition getLocalRevisionNumberFromRepository.
|
|
|
536 |
].
|
|
|
537 |
|
|
|
538 |
"/
|
|
|
539 |
"/ first, create a temporary work tree
|
|
|
540 |
"/
|
|
|
541 |
tempdir := checkInDefinition tempDirectory.
|
|
|
542 |
|
|
|
543 |
tempdir notNil ifTrue:[
|
|
|
544 |
[
|
|
|
545 |
modulePath := checkInDefinition modulePath.
|
|
|
546 |
checkoutName := checkInDefinition checkoutName.
|
|
|
547 |
|
|
|
548 |
workSpaceDefinition := self createWorkspaceFor:checkInDefinition.
|
|
|
549 |
workSpaceDefinition isNil ifTrue:[
|
|
|
550 |
('PerforceSourceCodeManager [error]: failed to create workspace for', checkoutName) errorPrintCR.
|
|
|
551 |
^ false
|
|
|
552 |
].
|
|
|
553 |
checkInDefinition workSpaceDefinition:workSpaceDefinition.
|
|
|
554 |
|
|
|
555 |
workspaceDefinitionFile := checkInDefinition workSpaceDefinitionFilename.
|
|
|
556 |
workspaceDefinitionFile notNil ifTrue:[
|
|
|
557 |
[
|
|
|
558 |
workSpaceName := checkInDefinition workSpaceName.
|
|
|
559 |
newestRevision := checkInDefinition getNewestRevisionNumber.
|
|
|
560 |
|
|
|
561 |
newestRevision isNil ifTrue:[
|
|
|
562 |
" create container for class initial check in"
|
|
|
563 |
(binRevision notNil) ifTrue:[
|
|
|
564 |
(Dialog confirm:('Someone seems to have removed the source container for ',cls name,'\\Force new checkin ?') withCRs) ifTrue:[
|
|
|
565 |
cls setBinaryRevision:nil.
|
|
|
566 |
^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleName logMessage:logMsg force:forceArg.
|
|
|
567 |
].
|
|
|
568 |
].
|
|
|
569 |
"initial checkin here"
|
|
|
570 |
^ self initialCheckinFor:checkInDefinition.
|
|
|
571 |
].
|
|
|
572 |
"/ is the version correct ?
|
|
|
573 |
locRevision > newestRevision ifTrue:[
|
|
|
574 |
(Dialog confirm:('The version-info of ',cls name allBold,' is wrong \(The class version (',revision allBold,') is newer than the newest version in the repository (',newestRevision printString allBold,').\\Patch the version and retry checkin ?') withCRs)
|
|
|
575 |
ifTrue:[
|
|
|
576 |
newVersionString := self updatedRevisionStringOf:cls forRevision:newestRevision with:cls revisionString.
|
|
|
577 |
cls updateVersionMethodFor:newVersionString.
|
|
|
578 |
^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleName logMessage:logMsg force:forceArg.
|
|
|
579 |
].
|
|
|
580 |
].
|
|
|
581 |
newestRevision > locRevision ifTrue:[
|
|
|
582 |
"someone changed repository in the meanwhile"
|
|
|
583 |
self activityNotification:'merging ' , cls name , ' with repository version...'.
|
|
|
584 |
self mergeOrResolveConflictsFor:checkInDefinition.
|
|
|
585 |
self postCheckInClass:cls checkInDefinition:checkInDefinition.
|
|
|
586 |
] ifFalse:[
|
|
|
587 |
result := self standardCheckinFor:checkInDefinition localRevision:locRevision.
|
|
|
588 |
result ifFalse:[
|
|
|
589 |
('PerforceSourceCodeManager [error]: failed to checkin ', checkoutName) errorPrintCR.
|
|
|
590 |
^ false
|
|
|
591 |
].
|
|
|
592 |
].
|
|
|
593 |
]
|
|
|
594 |
ensure:[
|
|
|
595 |
" we have to revert all before delete workspace "
|
|
|
596 |
depotRoot := workSpaceDefinition at:#repositoryDir ifAbsent:nil.
|
|
|
597 |
depotRoot notNil ifTrue:[
|
|
|
598 |
cmd := ('revert ' , depotRoot).
|
|
|
599 |
result := self executePerforceCommand:cmd
|
|
|
600 |
module:moduleName
|
|
|
601 |
inDirectory:tempdir
|
|
|
602 |
log:true
|
|
|
603 |
pipe:false
|
|
|
604 |
clientName:workSpaceName.
|
|
|
605 |
].
|
|
|
606 |
cmd := ('client -d ' , workSpaceName).
|
|
|
607 |
result := self executePerforceCommand:cmd
|
|
|
608 |
module:moduleName
|
|
|
609 |
inDirectory:tempdir
|
|
|
610 |
log:true
|
|
|
611 |
pipe:false
|
|
|
612 |
clientName:workSpaceName.
|
|
|
613 |
|
|
|
614 |
].
|
|
|
615 |
].
|
|
|
616 |
] ensure:[
|
|
|
617 |
tempdir recursiveRemove.
|
|
|
618 |
].
|
|
|
619 |
].
|
|
|
620 |
^ true
|
|
|
621 |
|
|
|
622 |
"
|
|
|
623 |
SourceCodeManager checkinClass:Array logMessage:'testing only'
|
|
|
624 |
"
|
|
|
625 |
|
|
|
626 |
"Created: / 11-09-1996 / 16:16:11 / cg"
|
|
|
627 |
"Modified: / 26-02-1998 / 17:34:16 / stefan"
|
|
|
628 |
"Modified: / 25-10-2006 / 17:41:46 / cg"
|
|
|
629 |
!
|
|
|
630 |
|
|
|
631 |
checkinClass:cls fileName:classFileName directory:packageDir module:moduleName source:sourceFileName logMessage:logMessage force:forceArg
|
|
|
632 |
"enter a classes source code (which has been already filed out into sourceFileName)
|
|
|
633 |
here we have to create our own source file
|
|
|
634 |
into the source repository. If the force argument is true, no merge is done;
|
|
|
635 |
instead, the code is checked in as given (Dangerous).
|
|
|
636 |
Return true if ok, false if not."
|
|
|
637 |
|
|
|
638 |
^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleName logMessage:logMessage force:forceArg
|
|
|
639 |
|
|
|
640 |
"
|
|
|
641 |
SourceCodeManager checkinClass:Array logMessage:'testing only'
|
|
|
642 |
"
|
|
|
643 |
|
|
|
644 |
"Created: / 11-09-1996 / 16:16:11 / cg"
|
|
|
645 |
"Modified: / 26-02-1998 / 17:34:16 / stefan"
|
|
|
646 |
"Modified: / 25-10-2006 / 17:41:46 / cg"
|
|
|
647 |
!
|
|
|
648 |
|
|
|
649 |
createContainerFor:aClass inModule:moduleName directory:dirName container:fileName
|
|
|
650 |
"create a new container & check into it an initial version of aClass"
|
|
|
651 |
|
|
|
652 |
self shouldImplement
|
|
|
653 |
!
|
|
|
654 |
|
|
|
655 |
createContainerFor:cls inModule:moduleName package:packageDir container:classFileName
|
|
|
656 |
|
|
|
657 |
^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleName logMessage:'Initial check in' force:false.
|
|
|
658 |
!
|
|
|
659 |
|
|
|
660 |
createContainerFor:cls inModule:moduleName package:packageDir container:classFileName logMessage:logMessage
|
|
|
661 |
|
|
|
662 |
|
|
|
663 |
^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleName logMessage:logMessage force:false.
|
|
|
664 |
!
|
|
|
665 |
|
|
|
666 |
createModule:moduleName
|
|
|
667 |
"create a new module directory"
|
|
|
668 |
|
|
|
669 |
self shouldImplement
|
|
|
670 |
!
|
|
|
671 |
|
|
|
672 |
createModule:module directory:directory
|
|
|
673 |
"nothing to do with PerforceSourceCodeManager
|
|
|
674 |
subdirectory in repository will created with adding the file "
|
|
|
675 |
|
|
|
676 |
^ true
|
|
|
677 |
!
|
|
|
678 |
|
|
|
679 |
initialRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName
|
|
|
680 |
"return a string usable as initial revision string"
|
|
|
681 |
|
|
|
682 |
|
|
|
683 |
|modulePath workSpaceDefinition version checkoutName repositoryDir repositoryPathName|
|
|
|
684 |
|
|
|
685 |
modulePath := moduleDir , '/' , packageDir.
|
|
|
686 |
checkoutName := modulePath , '/' , aClass name, '.st'.
|
|
|
687 |
workSpaceDefinition := self getWorkSpaceForModule:moduleDir modulePath:modulePath.
|
|
|
688 |
version := PerforceVersionInfo new.
|
|
|
689 |
repositoryDir := workSpaceDefinition at:#repositoryDir.
|
|
|
690 |
(repositoryDir endsWith:'...') ifTrue:[
|
|
|
691 |
repositoryDir := repositoryDir copyTo:(repositoryDir size - 3).
|
|
|
692 |
].
|
|
|
693 |
|
|
|
694 |
repositoryPathName := repositoryDir asFilename construct:checkoutName.
|
|
|
695 |
version repositoryPathName:repositoryPathName pathName.
|
|
|
696 |
version revision:'1'.
|
|
|
697 |
^ version getVersionString.
|
|
|
698 |
!
|
|
|
699 |
|
|
|
700 |
readRevisionLogEntryFromStream:inStream
|
|
|
701 |
"read and parse a single revision info-entry from the cvs log output.
|
|
|
702 |
Return nil on end.
|
|
|
703 |
|
|
|
704 |
The returned information is a structure (IdentityDictionary)
|
|
|
705 |
filled with:
|
|
|
706 |
#revision -> the revision string
|
|
|
707 |
#author -> who checked that revision into the repository
|
|
|
708 |
#date -> when was it checked in
|
|
|
709 |
#state -> the RCS state
|
|
|
710 |
#numberOfChangedLines -> the number of changed line w.r.t the previous
|
|
|
711 |
#logMessage -> the checkIn log message
|
|
|
712 |
"
|
|
|
713 |
|
|
|
714 |
|revLine1 atEnd|
|
|
|
715 |
|
|
|
716 |
atEnd := false.
|
|
|
717 |
|
|
|
718 |
revLine1 := inStream nextLine.
|
|
|
719 |
^ self readRevisionLogEntryFromString:revLine1.
|
|
|
720 |
!
|
|
|
721 |
|
|
|
722 |
readRevisionLogEntryFromString:revLine1
|
|
|
723 |
"read and parse a single revision info-entry from the cvs log output.
|
|
|
724 |
Return nil on end.
|
|
|
725 |
|
|
|
726 |
The returned information is a structure (IdentityDictionary)
|
|
|
727 |
filled with:
|
|
|
728 |
#revision -> the revision string
|
|
|
729 |
#author -> who checked that revision into the repository
|
|
|
730 |
#date -> when was it checked in
|
|
|
731 |
#state -> the RCS state
|
|
|
732 |
#numberOfChangedLines -> the number of changed line w.r.t the previous
|
|
|
733 |
#logMessage -> the checkIn log message
|
|
|
734 |
"
|
|
|
735 |
|
|
|
736 |
| record revisionLineElements noOfRevisionLineElements posText|
|
|
|
737 |
|
|
|
738 |
(revLine1 notNil) ifTrue:[
|
|
|
739 |
record := IdentityDictionary new.
|
|
|
740 |
revisionLineElements := revLine1 asCollectionOfWords.
|
|
|
741 |
noOfRevisionLineElements := revisionLineElements size.
|
|
|
742 |
noOfRevisionLineElements > 1 ifTrue:[
|
|
|
743 |
record at:#revision put:((revisionLineElements at:2) copyFrom:2).
|
|
|
744 |
].
|
|
|
745 |
noOfRevisionLineElements > 8 ifTrue:[
|
|
|
746 |
record at:#author put:(revisionLineElements at:9).
|
|
|
747 |
].
|
|
|
748 |
noOfRevisionLineElements > 6 ifTrue:[
|
|
|
749 |
record at:#date put:(revisionLineElements at:7).
|
|
|
750 |
].
|
|
|
751 |
noOfRevisionLineElements > 4 ifTrue:[
|
|
|
752 |
record at:#state put:(revisionLineElements at:5).
|
|
|
753 |
].
|
|
|
754 |
noOfRevisionLineElements > 10 ifTrue:[
|
|
|
755 |
posText := 0.
|
|
|
756 |
1 to:9 do:[:ele| posText := posText + (revisionLineElements at:ele) size + 1].
|
|
|
757 |
record at:#logMessage put:(revLine1 copyFrom:posText).
|
|
|
758 |
].
|
|
|
759 |
].
|
|
|
760 |
^record.
|
|
|
761 |
!
|
|
|
762 |
|
|
|
763 |
revisionLogOf:clsOrNil fromRevision:firstRev toRevision:lastRef numberOfRevisions:numRevisions fileName:classFileName directory:packageDir module:moduleName
|
|
|
764 |
"return info about the repository container and
|
|
|
765 |
(part of) the revisionlog as a collection of revision entries.
|
|
|
766 |
Return nil on failure.
|
|
|
767 |
|
|
|
768 |
If numRevisions is notNil, it limits the number of revision records returned -
|
|
|
769 |
only numRevions of the newest revision infos will be collected.
|
|
|
770 |
|
|
|
771 |
The returned information is a structure (IdentityDictionary)
|
|
|
772 |
filled with:
|
|
|
773 |
#newestRevision -> the revisionString of the newest revision
|
|
|
774 |
#numberOfRevisions -> the number of revisions in the container (nil for all)
|
|
|
775 |
#revisions -> collection of per-revision info (see below)
|
|
|
776 |
|
|
|
777 |
firstRev / lastRef specify from which revisions a logEntry is wanted:
|
|
|
778 |
-If firstRev is nil, the first revision is the initial revision
|
|
|
779 |
otherwise, the log starts with that revision.
|
|
|
780 |
-If lastRef is nil, the last revision is the newest revision
|
|
|
781 |
otherwise, the log ends with that revision.
|
|
|
782 |
|
|
|
783 |
-If both are nil, all logEntries are extracted.
|
|
|
784 |
-If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
|
|
|
785 |
|
|
|
786 |
per revision info consists of one record per revision:
|
|
|
787 |
|
|
|
788 |
#revision -> the revision string
|
|
|
789 |
#author -> who checked that revision into the repository
|
|
|
790 |
#date -> when was it checked in
|
|
|
791 |
#state -> the RCS state
|
|
|
792 |
#numberOfChangedLines -> the number of changed line w.r.t the previous
|
|
|
793 |
#logMessage -> the checkIn log message
|
|
|
794 |
|
|
|
795 |
revisions are ordered newest first
|
|
|
796 |
(i.e. the last entry is for the initial revision; the first for the most recent one)
|
|
|
797 |
Attention: if state = 'dead' that revision is no longer valid.
|
|
|
798 |
"
|
|
|
799 |
|
|
|
800 |
|fullName modulePath inStream atEnd line inHeaderInfo workSpaceDefinition
|
|
|
801 |
info record revisionRecords headerOnly msg revArg inDirectory infoAndLogString elements newestRevision foundView|
|
|
|
802 |
|
|
|
803 |
|
|
|
804 |
[
|
|
|
805 |
|cmd |
|
|
|
806 |
|
|
|
807 |
modulePath := moduleName , '/' , packageDir.
|
|
|
808 |
fullName := modulePath , '/' , classFileName.
|
|
|
809 |
|
|
|
810 |
revArg := ''.
|
|
|
811 |
headerOnly := false.
|
|
|
812 |
(firstRev notNil or:[lastRef notNil]) ifTrue:[
|
|
|
813 |
(firstRev == 0 and:[lastRef == 0]) ifTrue:[
|
|
|
814 |
headerOnly := true.
|
|
|
815 |
]
|
|
|
816 |
].
|
|
|
817 |
|
|
|
818 |
headerOnly ifTrue:[
|
|
|
819 |
msg := 'fetching revision info '
|
|
|
820 |
] ifFalse:[
|
|
|
821 |
msg := 'reading revision log '
|
|
|
822 |
].
|
|
|
823 |
clsOrNil isNil ifTrue:[
|
|
|
824 |
msg := msg , 'in ' , fullName.
|
|
|
825 |
] ifFalse:[
|
|
|
826 |
msg := msg , 'of ', clsOrNil name.
|
|
|
827 |
].
|
|
|
828 |
self activityNotification:msg,'...'.
|
|
|
829 |
|
|
|
830 |
workSpaceDefinition := self getWorkSpaceForModule:moduleName.
|
|
|
831 |
workSpaceDefinition isNil ifTrue:[
|
|
|
832 |
self error:('Perforce cant get workspace definition for module ', moduleName, '.').
|
|
|
833 |
^ nil.
|
|
|
834 |
].
|
|
|
835 |
foundView := workSpaceDefinition at:#repositoryDir.
|
|
|
836 |
workSpaceDefinition isNil ifTrue:[
|
|
|
837 |
self error:('Perforce cant get repository path for module ', moduleName, '.').
|
|
|
838 |
^ nil.
|
|
|
839 |
].
|
|
|
840 |
(foundView endsWith:'...') ifTrue:[
|
|
|
841 |
foundView := foundView copyTo:(foundView size - 3).
|
|
|
842 |
].
|
|
|
843 |
foundView := foundView , fullName.
|
|
|
844 |
|
|
|
845 |
cmd := ('filelog ' , foundView).
|
|
|
846 |
|
|
|
847 |
inDirectory := (Filename currentDirectory asAbsoluteFilename construct:modulePath) pathName.
|
|
|
848 |
inStream := self executePerforceCommand:cmd
|
|
|
849 |
module:moduleName
|
|
|
850 |
inDirectory:inDirectory
|
|
|
851 |
log:true
|
|
|
852 |
pipe:true.
|
|
|
853 |
inStream isNil ifTrue:[
|
|
|
854 |
('PerforceSourceCodeManager [error]: cannot open pipe to perforce filelog ', fullName) errorPrintCR.
|
|
|
855 |
^ nil
|
|
|
856 |
].
|
|
|
857 |
|
|
|
858 |
"/
|
|
|
859 |
"/ read the commands pipe output and extract the container info
|
|
|
860 |
"/
|
|
|
861 |
info := IdentityDictionary new.
|
|
|
862 |
inHeaderInfo := true.
|
|
|
863 |
revisionRecords := OrderedCollection new.
|
|
|
864 |
[inHeaderInfo and:[inStream atEnd not]] whileTrue:[
|
|
|
865 |
line:= inStream nextLine.
|
|
|
866 |
line notNil ifTrue:[
|
|
|
867 |
|gotIt|
|
|
|
868 |
|
|
|
869 |
gotIt := false.
|
|
|
870 |
infoAndLogString := line asCollectionOfSubstringsSeparatedBy:$'.
|
|
|
871 |
elements := infoAndLogString size.
|
|
|
872 |
elements > 1 ifTrue:[
|
|
|
873 |
record := self readRevisionLogEntryFromString:line.
|
|
|
874 |
newestRevision := record at:#revision.
|
|
|
875 |
info at:#newestRevision put:newestRevision.
|
|
|
876 |
info at:#numberOfRevisions put:newestRevision asNumber.
|
|
|
877 |
revisionRecords add:record.
|
|
|
878 |
inHeaderInfo := false
|
|
|
879 |
].
|
|
|
880 |
]
|
|
|
881 |
].
|
|
|
882 |
|
|
|
883 |
info isEmpty ifTrue:[
|
|
|
884 |
('PerforceSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
|
|
|
885 |
^ nil
|
|
|
886 |
].
|
|
|
887 |
|
|
|
888 |
"/ strip selected revisions from the total-revisions entry
|
|
|
889 |
headerOnly ifFalse:[
|
|
|
890 |
"/
|
|
|
891 |
"/ continue to read the commands pipe output
|
|
|
892 |
"/ and extract revision info records
|
|
|
893 |
"/
|
|
|
894 |
info at:#revisions put:revisionRecords.
|
|
|
895 |
|
|
|
896 |
atEnd := false.
|
|
|
897 |
[atEnd or:[inStream atEnd]] whileFalse:[
|
|
|
898 |
record := self readRevisionLogEntryFromStream:inStream.
|
|
|
899 |
record isNil ifTrue:[
|
|
|
900 |
atEnd := true.
|
|
|
901 |
] ifFalse:[
|
|
|
902 |
revisionRecords add:record.
|
|
|
903 |
].
|
|
|
904 |
(numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
|
|
|
905 |
atEnd := true
|
|
|
906 |
]
|
|
|
907 |
].
|
|
|
908 |
].
|
|
|
909 |
] ensure:[
|
|
|
910 |
inStream notNil ifTrue:[inStream close].
|
|
|
911 |
|
|
|
912 |
self activityNotification:nil.
|
|
|
913 |
].
|
|
|
914 |
^ info
|
|
|
915 |
|
|
|
916 |
"
|
|
|
917 |
AbstractSourceCodeManager revisionLogOf:ExtIF
|
|
|
918 |
SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43'
|
|
|
919 |
SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil
|
|
|
920 |
SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'
|
|
|
921 |
SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil
|
|
|
922 |
SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0
|
|
|
923 |
"
|
|
|
924 |
|
|
|
925 |
"Created: / 16-11-1995 / 13:25:30 / cg"
|
|
|
926 |
"Modified: / 29-01-1997 / 16:51:30 / stefan"
|
|
|
927 |
"Modified: / 29-08-2006 / 14:57:26 / cg"
|
|
|
928 |
! !
|
|
|
929 |
|
|
|
930 |
!PerforceSourceCodeManager class methodsFor:'execute'!
|
|
|
931 |
|
|
|
932 |
executePerforceCommand:cvsCommand module:moduleName inDirectory:dir
|
|
|
933 |
"execute command and prepend cvs command name and global options.
|
|
|
934 |
if dir ~= nil, execute command in that directory.
|
|
|
935 |
This also leads to a log-entry to be added to cvs's logfile."
|
|
|
936 |
|
|
|
937 |
^ self
|
|
|
938 |
executePerforceCommand:cvsCommand
|
|
|
939 |
module:moduleName
|
|
|
940 |
inDirectory:dir
|
|
|
941 |
log:true
|
|
|
942 |
!
|
|
|
943 |
|
|
|
944 |
executePerforceCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
|
|
|
945 |
"execute command and prepend cvs command name and global options.
|
|
|
946 |
if dir ~= nil, execute command in that directory.
|
|
|
947 |
The doLog argument, if false supresses a logEntry to be added
|
|
|
948 |
in the cvs log file (used when reading / extracting history)"
|
|
|
949 |
|
|
|
950 |
^ self
|
|
|
951 |
executePerforceCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
|
|
|
952 |
pipe:false
|
|
|
953 |
!
|
|
|
954 |
|
|
|
955 |
executePerforceCommand:perforceCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe
|
|
|
956 |
"execute command and prepend perforce command name and global options.
|
|
|
957 |
execute command in the dirArg directory.
|
|
|
958 |
The doLog argument, if false supresses a logEntry to be added
|
|
|
959 |
in the cvs log file (used when reading / extracting history)"
|
|
|
960 |
|
|
|
961 |
^ self executePerforceCommand:perforceCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe clientName:nil
|
|
|
962 |
!
|
|
|
963 |
|
|
|
964 |
executePerforceCommand:perforceCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe clientName:clientName
|
|
|
965 |
"execute command and prepend perforce command name and global options.
|
|
|
966 |
execute command in the dirArg directory.
|
|
|
967 |
The doLog argument, if false supresses a logEntry to be added
|
|
|
968 |
in the cvs log file (used when reading / extracting history)"
|
|
|
969 |
|
|
|
970 |
^ self executePerforceCommand:perforceCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe clientName:clientName inputFrom:nil.
|
|
|
971 |
!
|
|
|
972 |
|
|
|
973 |
executePerforceCommand:perforceCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe clientName:clientName inputFrom:inputStream
|
|
|
974 |
"execute command and prepend perforce command name and global options.
|
|
|
975 |
execute command in the dirArg directory.
|
|
|
976 |
The doLog argument, if false supresses a logEntry to be added
|
|
|
977 |
in the cvs log file (used when reading / extracting history)"
|
|
|
978 |
|
|
|
979 |
|command perforceSettings rslt ok pathOfDir errorString commandStream password user port client executable|
|
|
|
980 |
|
|
|
981 |
dirArg notNil ifTrue:[
|
|
|
982 |
pathOfDir := dirArg asFilename pathName.
|
|
|
983 |
].
|
|
|
984 |
|
|
|
985 |
perforceSettings := self getPerforceSettingsForModule:moduleName.
|
|
|
986 |
perforceSettings isNil ifTrue:[ ^ nil].
|
|
|
987 |
|
|
|
988 |
commandStream := WriteStream on:''.
|
|
|
989 |
executable := self perforceExecutable.
|
|
|
990 |
(executable includes:Character space) ifTrue:[
|
|
|
991 |
commandStream nextPut:$".
|
|
|
992 |
commandStream nextPutAll:executable.
|
|
|
993 |
commandStream nextPut:$".
|
|
|
994 |
] ifFalse:[
|
|
|
995 |
commandStream nextPutAll:executable.
|
|
|
996 |
].
|
|
|
997 |
commandStream space.
|
|
|
998 |
port := perforceSettings at:#port ifAbsent:nil.
|
|
|
999 |
port notNil ifTrue:[
|
|
|
1000 |
commandStream space.
|
|
|
1001 |
commandStream nextPutAll:'-p '.
|
|
|
1002 |
commandStream nextPutAll:(perforceSettings at:#port).
|
|
|
1003 |
commandStream space.
|
|
|
1004 |
].
|
|
|
1005 |
clientName notNil ifTrue:[
|
|
|
1006 |
client := clientName.
|
|
|
1007 |
] ifFalse:[
|
|
|
1008 |
client := perforceSettings at:#client ifAbsent:nil.
|
|
|
1009 |
].
|
|
|
1010 |
client notEmptyOrNil ifTrue:[
|
|
|
1011 |
commandStream space.
|
|
|
1012 |
commandStream nextPutAll:'-c '.
|
|
|
1013 |
commandStream nextPutAll:client.
|
|
|
1014 |
commandStream space.
|
|
|
1015 |
].
|
|
|
1016 |
user := perforceSettings at:#user ifAbsent:nil.
|
|
|
1017 |
user notNil ifTrue:[
|
|
|
1018 |
commandStream space.
|
|
|
1019 |
commandStream nextPutAll:'-u '.
|
|
|
1020 |
commandStream nextPutAll:(perforceSettings at:#user).
|
|
|
1021 |
commandStream space.
|
|
|
1022 |
].
|
|
|
1023 |
password := perforceSettings at:#password ifAbsent:nil.
|
|
|
1024 |
password notNil ifTrue:[
|
|
|
1025 |
commandStream space.
|
|
|
1026 |
commandStream nextPutAll:'-P '.
|
|
|
1027 |
commandStream nextPutAll:(perforceSettings at:#password ifAbsent:'').
|
|
|
1028 |
commandStream space.
|
|
|
1029 |
].
|
|
|
1030 |
commandStream nextPutAll:perforceCommand.
|
|
|
1031 |
|
|
|
1032 |
command := commandStream contents.
|
|
|
1033 |
Verbose == true ifTrue:[
|
|
|
1034 |
('PerforceSourceCodeManager [info]: executing: ' , command , ' [in ' , (pathOfDir?'.') , ']') infoPrintCR.
|
|
|
1035 |
].
|
|
|
1036 |
doPipe ifTrue:[
|
|
|
1037 |
rslt := PipeStream readingFrom:command errorDisposition:#inline inDirectory:pathOfDir.
|
|
|
1038 |
ok := rslt notNil.
|
|
|
1039 |
] ifFalse:[
|
|
|
1040 |
Processor isDispatching ifFalse:[
|
|
|
1041 |
rslt := ok := OperatingSystem executeCommand:command
|
|
|
1042 |
inputFrom:inputStream
|
|
|
1043 |
outputTo:nil
|
|
|
1044 |
errorTo:nil
|
|
|
1045 |
auxFrom:nil
|
|
|
1046 |
inDirectory:pathOfDir
|
|
|
1047 |
lineWise:true
|
|
|
1048 |
onError:[:status| false].
|
|
|
1049 |
] ifTrue:[
|
|
|
1050 |
PerforceCommandSemaphore critical:[
|
|
|
1051 |
|p errOut|
|
|
|
1052 |
|
|
|
1053 |
errOut := WriteStream on:String new.
|
|
|
1054 |
p := [
|
|
|
1055 |
rslt := ok := OperatingSystem executeCommand:command
|
|
|
1056 |
inputFrom:inputStream
|
|
|
1057 |
outputTo:nil
|
|
|
1058 |
errorTo:nil
|
|
|
1059 |
auxFrom:nil
|
|
|
1060 |
inDirectory:pathOfDir
|
|
|
1061 |
lineWise:true
|
|
|
1062 |
onError:[:status| false].
|
|
|
1063 |
] fork.
|
|
|
1064 |
|
|
|
1065 |
(p waitUntilTerminatedWithTimeout:300) ifTrue:[
|
|
|
1066 |
('PerforceSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
|
|
|
1067 |
ok := false.
|
|
|
1068 |
errorString := 'Perforce command timeout'.
|
|
|
1069 |
] ifFalse:[
|
|
|
1070 |
ok ifFalse:[
|
|
|
1071 |
errorString := errOut contents.
|
|
|
1072 |
].
|
|
|
1073 |
].
|
|
|
1074 |
].
|
|
|
1075 |
].
|
|
|
1076 |
].
|
|
|
1077 |
|
|
|
1078 |
ok ifFalse:[
|
|
|
1079 |
('PerforceSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
|
|
|
1080 |
|
|
|
1081 |
SourceCodeManagerError isHandled ifTrue:[
|
|
|
1082 |
SourceCodeManagerError raiseErrorString:(errorString ? 'Perforce Error').
|
|
|
1083 |
].
|
|
|
1084 |
].
|
|
|
1085 |
^ rslt.
|
|
|
1086 |
|
|
|
1087 |
"Modified: / 23-04-1996 / 15:24:00 / stefan"
|
|
|
1088 |
"Created: / 20-05-1998 / 16:06:34 / cg"
|
|
|
1089 |
"Modified: / 29-09-2006 / 15:06:42 / cg"
|
|
|
1090 |
! !
|
|
|
1091 |
|
|
|
1092 |
!PerforceSourceCodeManager class methodsFor:'private'!
|
|
|
1093 |
|
|
|
1094 |
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
|
|
|
1095 |
"trouble checking in - open a dialog"
|
|
|
1096 |
|
|
|
1097 |
^ self
|
|
|
1098 |
checkinTroubleDialog:title
|
|
|
1099 |
message:message
|
|
|
1100 |
log:log
|
|
|
1101 |
abortable:abortable
|
|
|
1102 |
option:optionTitle
|
|
|
1103 |
option2:nil
|
|
|
1104 |
|
|
|
1105 |
"Created: 10.12.1995 / 17:34:33 / cg"
|
|
|
1106 |
"Modified: 12.9.1996 / 02:39:06 / cg"
|
|
|
1107 |
!
|
|
|
1108 |
|
|
|
1109 |
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
|
|
|
1110 |
^self
|
|
|
1111 |
checkinTroubleDialog:title
|
|
|
1112 |
message:message
|
|
|
1113 |
log:log
|
|
|
1114 |
abortable:abortable
|
|
|
1115 |
option:optionTitle
|
|
|
1116 |
option2:optionTitle2
|
|
|
1117 |
option3:nil
|
|
|
1118 |
!
|
|
|
1119 |
|
|
|
1120 |
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
|
|
|
1121 |
"trouble checking in - open a dialog"
|
|
|
1122 |
|
|
|
1123 |
|l box list listView optionPressed option2Pressed option3Pressed|
|
|
|
1124 |
|
|
|
1125 |
l := log collect:[:line | line withTabsExpanded].
|
|
|
1126 |
list := SelectionInList with:l.
|
|
|
1127 |
|
|
|
1128 |
box := Dialog new.
|
|
|
1129 |
box label:(title).
|
|
|
1130 |
|
|
|
1131 |
(box addTextLabel:message) borderWidth:0.
|
|
|
1132 |
|
|
|
1133 |
listView := SelectionInListView on:list.
|
|
|
1134 |
listView disable.
|
|
|
1135 |
listView height:200.
|
|
|
1136 |
box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
|
|
|
1137 |
box addVerticalSpace.
|
|
|
1138 |
|
|
|
1139 |
abortable ifTrue:[
|
|
|
1140 |
box addAbortButton
|
|
|
1141 |
].
|
|
|
1142 |
optionTitle notNil ifTrue:[
|
|
|
1143 |
box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
|
|
|
1144 |
].
|
|
|
1145 |
optionTitle2 notNil ifTrue:[
|
|
|
1146 |
box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
|
|
|
1147 |
].
|
|
|
1148 |
optionTitle3 notNil ifTrue:[
|
|
|
1149 |
box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
|
|
|
1150 |
].
|
|
|
1151 |
box addOkButton.
|
|
|
1152 |
|
|
|
1153 |
box extent:(box preferredExtent).
|
|
|
1154 |
box minExtent:box extent.
|
|
|
1155 |
box maxExtent:box extent.
|
|
|
1156 |
|
|
|
1157 |
box open.
|
|
|
1158 |
|
|
|
1159 |
box destroy.
|
|
|
1160 |
optionPressed == true ifTrue:[^ #option].
|
|
|
1161 |
option2Pressed == true ifTrue:[^ #option2].
|
|
|
1162 |
option3Pressed == true ifTrue:[^ #option3].
|
|
|
1163 |
^ box accepted
|
|
|
1164 |
|
|
|
1165 |
"Created: 9.9.1996 / 19:12:45 / cg"
|
|
|
1166 |
"Modified: 12.9.1996 / 02:39:10 / cg"
|
|
|
1167 |
!
|
|
|
1168 |
|
|
|
1169 |
createWorkspaceFor:checkInDefinition
|
|
|
1170 |
"
|
|
|
1171 |
create an temporary workspace for handle checkin
|
|
|
1172 |
"
|
|
|
1173 |
|
|
|
1174 |
|workSpaceName workSpaceDefinitionFilename ws cmd foundView result
|
|
|
1175 |
workSpaceDefinition readStream moduleName modulePath directory|
|
|
|
1176 |
|
|
|
1177 |
moduleName := checkInDefinition moduleName.
|
|
|
1178 |
modulePath := checkInDefinition modulePath.
|
|
|
1179 |
directory := checkInDefinition tempDirectory.
|
|
|
1180 |
workSpaceDefinition := self getWorkSpaceForModule:moduleName modulePath:modulePath.
|
|
|
1181 |
workSpaceDefinition isNil ifTrue:[
|
|
|
1182 |
self error:('Perforce cant get workspace definition for module ', moduleName, '.').
|
|
|
1183 |
^ nil.
|
|
|
1184 |
].
|
|
|
1185 |
directory exists ifFalse:[
|
|
|
1186 |
self error:('Perforce create workspace directory ', directory pathName, ' not exists.').
|
|
|
1187 |
^ nil.
|
|
|
1188 |
].
|
|
|
1189 |
foundView := workSpaceDefinition at:#repositoryDir.
|
|
|
1190 |
workSpaceName := UUID genUUID displayString.
|
|
|
1191 |
workSpaceName := 'stxTestWorkSpace'.
|
|
|
1192 |
workSpaceDefinition at:#workSpaceName put:workSpaceName.
|
|
|
1193 |
workSpaceDefinitionFilename := directory asFilename construct:workSpaceName.
|
|
|
1194 |
workSpaceDefinition at:#workSpaceDefinitionFilename put:workSpaceDefinitionFilename.
|
|
|
1195 |
ws := workSpaceDefinitionFilename writeStream.
|
|
|
1196 |
ws nextPutAll:'Client: '.
|
|
|
1197 |
ws nextPutAll:workSpaceName.
|
|
|
1198 |
ws cr.
|
|
|
1199 |
ws nextPutAll:'Owner: '.
|
|
|
1200 |
ws nextPutAll:(workSpaceDefinition at:#owner).
|
|
|
1201 |
ws cr.
|
|
|
1202 |
ws nextPutAll:'Host: '.
|
|
|
1203 |
ws nextPutAll:(workSpaceDefinition at:#host).
|
|
|
1204 |
ws cr.
|
|
|
1205 |
ws nextPutAll:'Description: '.
|
|
|
1206 |
ws nextPutAll:'Used temporary for Smalltalk/X'.
|
|
|
1207 |
ws cr.
|
|
|
1208 |
ws nextPutAll:'Root: '.
|
|
|
1209 |
ws nextPutAll:directory asFilename pathName.
|
|
|
1210 |
ws cr.
|
|
|
1211 |
ws nextPutAll:'Options: '.
|
|
|
1212 |
ws nextPutAll:'allwrite noclobber nocompress unlocked nomodtime normdir'.
|
|
|
1213 |
ws cr.
|
|
|
1214 |
ws nextPutAll:'SubmitOptions: '.
|
|
|
1215 |
ws nextPutAll:'submitunchanged'.
|
|
|
1216 |
ws cr.
|
|
|
1217 |
ws nextPutAll:'LineEnd: '.
|
|
|
1218 |
ws nextPutAll:'local'.
|
|
|
1219 |
ws cr.
|
|
|
1220 |
ws nextPutAll:'View: '.
|
|
|
1221 |
ws nextPutAll:foundView.
|
|
|
1222 |
ws space.
|
|
|
1223 |
ws nextPutAll:'//', workSpaceName, '/'.
|
|
|
1224 |
(foundView endsWith:'...') ifTrue:[
|
|
|
1225 |
ws nextPutAll:'...'.
|
|
|
1226 |
].
|
|
|
1227 |
ws cr.
|
|
|
1228 |
ws close.
|
|
|
1229 |
readStream := ReadStream on:workSpaceDefinitionFilename contents asString.
|
|
|
1230 |
cmd := 'client -i '.
|
|
|
1231 |
result := self executePerforceCommand:cmd
|
|
|
1232 |
module:moduleName
|
|
|
1233 |
inDirectory:directory pathName
|
|
|
1234 |
log:true
|
|
|
1235 |
pipe:false
|
|
|
1236 |
clientName:nil
|
|
|
1237 |
inputFrom:readStream.
|
|
|
1238 |
result ifFalse:[
|
|
|
1239 |
('PerforceSourceCodeManager [error]: cannot create perforce client ', workSpaceDefinitionFilename baseName) errorPrintCR.
|
|
|
1240 |
^ nil
|
|
|
1241 |
].
|
|
|
1242 |
|
|
|
1243 |
^ workSpaceDefinition.
|
|
|
1244 |
!
|
|
|
1245 |
|
|
|
1246 |
diffTextComment
|
|
|
1247 |
|
|
|
1248 |
|ws|
|
|
|
1249 |
|
|
|
1250 |
ws := WriteStream on:''.
|
|
|
1251 |
ws nextPutLine:'"/ ***************************************************************'.
|
|
|
1252 |
ws nextPutLine:'"/ This text contains your current versions code (blue)'.
|
|
|
1253 |
ws nextPutLine:'"/ merged with the conflicting code as found in the repository (red) which resulted'.
|
|
|
1254 |
ws nextPutLine:'"/ from some other checkin.'.
|
|
|
1255 |
ws nextPutLine:'"/ Each such conflict is surrounded by green text (like this paragraph).'.
|
|
|
1256 |
ws nextPutLine:'"/ '.
|
|
|
1257 |
ws nextPutLine:'"/ Please have a look at ALL the conflicts and fix things as appropriate.'.
|
|
|
1258 |
ws nextPutLine:'"/ Delete the green lines as a confirmation - I will not checkin the changed text,'.
|
|
|
1259 |
ws nextPutLine:'"/ unless no more green parts are present. This includes this comment at the top.'.
|
|
|
1260 |
ws nextPutLine:'"/ ***************************************************************'.
|
|
|
1261 |
^ ws contents
|
|
|
1262 |
!
|
|
|
1263 |
|
|
|
1264 |
getWorkSpaceForModule:aModule
|
|
|
1265 |
"
|
|
|
1266 |
create an temporary workspace for handle checkin
|
|
|
1267 |
"
|
|
|
1268 |
|
|
|
1269 |
^ self getWorkSpaceForModule:aModule modulePath:nil
|
|
|
1270 |
!
|
|
|
1271 |
|
|
|
1272 |
getWorkSpaceForModule:aModule modulePath:modulePath
|
|
|
1273 |
"
|
|
|
1274 |
create an temporary workspace for handle checkin
|
|
|
1275 |
"
|
|
|
1276 |
|
|
|
1277 |
|cmd inStream line views nextKey root myBaseDirectory client localDir position
|
|
|
1278 |
newLocalDir foundDir foundView workSpaceDefinition directoryPrefix|
|
|
|
1279 |
|
|
|
1280 |
modulePath isNil ifTrue:[
|
|
|
1281 |
directoryPrefix := aModule.
|
|
|
1282 |
] ifFalse:[
|
|
|
1283 |
directoryPrefix := modulePath.
|
|
|
1284 |
].
|
|
|
1285 |
workSpaceDefinition := Dictionary new.
|
|
|
1286 |
cmd := 'client -o'.
|
|
|
1287 |
myBaseDirectory := (Filename currentDirectory asAbsoluteFilename) pathName.
|
|
|
1288 |
inStream := self executePerforceCommand:cmd
|
|
|
1289 |
module:aModule
|
|
|
1290 |
inDirectory:myBaseDirectory
|
|
|
1291 |
log:true
|
|
|
1292 |
pipe:true.
|
|
|
1293 |
inStream isNil ifTrue:[
|
|
|
1294 |
('PerforceSourceCodeManager [error]: cannot open pipe to perforce client ') errorPrintCR.
|
|
|
1295 |
^ nil
|
|
|
1296 |
].
|
|
|
1297 |
views := OrderedCollection new.
|
|
|
1298 |
[inStream atEnd not] whileTrue:[
|
|
|
1299 |
line:= inStream nextLine.
|
|
|
1300 |
line notEmptyOrNil ifTrue:[
|
|
|
1301 |
line first = $# ifFalse:[
|
|
|
1302 |
(line startsWith:'Owner:') ifTrue:[
|
|
|
1303 |
workSpaceDefinition at:#owner put:line asCollectionOfWords second.
|
|
|
1304 |
].
|
|
|
1305 |
(line startsWith:'Host:') ifTrue:[
|
|
|
1306 |
workSpaceDefinition at:#host put:line asCollectionOfWords second.
|
|
|
1307 |
].
|
|
|
1308 |
(line startsWith:'Client:') ifTrue:[
|
|
|
1309 |
client := line asCollectionOfWords second.
|
|
|
1310 |
workSpaceDefinition at:#client put:client.
|
|
|
1311 |
].
|
|
|
1312 |
(line startsWith:'Root:') ifTrue:[
|
|
|
1313 |
root := line asCollectionOfWords second.
|
|
|
1314 |
workSpaceDefinition at:#root put:root.
|
|
|
1315 |
].
|
|
|
1316 |
(line startsWith:'View:') ifTrue:[
|
|
|
1317 |
nextKey := false.
|
|
|
1318 |
[nextKey not and:[inStream atEnd not]] whileTrue:[
|
|
|
1319 |
line:= inStream nextLine.
|
|
|
1320 |
line notEmptyOrNil ifTrue:[
|
|
|
1321 |
line first isSeparator ifTrue:[
|
|
|
1322 |
views add:(line asCollectionOfWords).
|
|
|
1323 |
] ifFalse:[
|
|
|
1324 |
nextKey := true.
|
|
|
1325 |
].
|
|
|
1326 |
].
|
|
|
1327 |
].
|
|
|
1328 |
].
|
|
|
1329 |
].
|
|
|
1330 |
].
|
|
|
1331 |
].
|
|
|
1332 |
views do:[:reposAndlocalDir |
|
|
|
1333 |
localDir := reposAndlocalDir second.
|
|
|
1334 |
position := localDir findString:client ifAbsent:nil.
|
|
|
1335 |
position isNil ifTrue:[
|
|
|
1336 |
('PerforceSourceCodeManager [error]: cannot get client view') errorPrintCR.
|
|
|
1337 |
^ nil
|
|
|
1338 |
].
|
|
|
1339 |
newLocalDir := (localDir copyTo:(position - 1)) copyFrom:2.
|
|
|
1340 |
newLocalDir := newLocalDir , root copyFrom:2.
|
|
|
1341 |
newLocalDir := newLocalDir , (localDir copyFrom:(position + client size + 1)).
|
|
|
1342 |
(newLocalDir endsWith:'...') ifTrue:[
|
|
|
1343 |
newLocalDir := newLocalDir copyTo:(newLocalDir size - 4).
|
|
|
1344 |
].
|
|
|
1345 |
(myBaseDirectory startsWith:newLocalDir) ifTrue:[
|
|
|
1346 |
(foundDir isNil or:[foundDir size < newLocalDir]) ifTrue:[
|
|
|
1347 |
foundDir := newLocalDir.
|
|
|
1348 |
foundView := reposAndlocalDir first.
|
|
|
1349 |
].
|
|
|
1350 |
].
|
|
|
1351 |
].
|
|
|
1352 |
foundDir isNil ifTrue:[
|
|
|
1353 |
('PerforceSourceCodeManager [error]: cannot open find my view in perforce client ') errorPrintCR.
|
|
|
1354 |
^ nil
|
|
|
1355 |
].
|
|
|
1356 |
workSpaceDefinition at:#localDir put:foundDir.
|
|
|
1357 |
workSpaceDefinition at:#repositoryDir put:foundView.
|
|
|
1358 |
^ workSpaceDefinition.
|
|
|
1359 |
!
|
|
|
1360 |
|
|
|
1361 |
initialCheckinFor:checkInDefinition
|
|
|
1362 |
|
|
|
1363 |
|modulePath checkoutName fullFileName classFileName packageDir moduleName logMsg force s class cmd result|
|
|
|
1364 |
|
|
|
1365 |
modulePath := checkInDefinition modulePath.
|
|
|
1366 |
checkoutName := checkInDefinition checkoutName.
|
|
|
1367 |
classFileName := checkInDefinition classFileName.
|
|
|
1368 |
class := checkInDefinition definitionClass.
|
|
|
1369 |
packageDir := checkInDefinition packageDir.
|
|
|
1370 |
moduleName := checkInDefinition moduleName.
|
|
|
1371 |
logMsg := checkInDefinition logMessage.
|
|
|
1372 |
force := checkInDefinition force.
|
|
|
1373 |
|
|
|
1374 |
(class binaryRevision notNil) ifTrue:[
|
|
|
1375 |
(Dialog confirm:('Someone seems to have removed the source container for ',class name,'\\Force new checkin ?') withCRs) ifTrue:[
|
|
|
1376 |
class setBinaryRevision:nil.
|
|
|
1377 |
^ self checkinClass:class fileName:classFileName directory:packageDir module:moduleName logMessage:logMsg force:force.
|
|
|
1378 |
].
|
|
|
1379 |
].
|
|
|
1380 |
"initial checkin here"
|
|
|
1381 |
fullFileName := checkInDefinition tempDirectory construct:checkoutName.
|
|
|
1382 |
fullFileName directory recursiveMakeDirectory.
|
|
|
1383 |
s := fullFileName writeStream.
|
|
|
1384 |
self fileOutSourceCodeOf:class on:s.
|
|
|
1385 |
s close.
|
|
|
1386 |
cmd := ('add -t +k ' , checkoutName).
|
|
|
1387 |
result := self executePerforceCommand:cmd
|
|
|
1388 |
module:moduleName
|
|
|
1389 |
inDirectory:checkInDefinition tempDirectory
|
|
|
1390 |
log:true
|
|
|
1391 |
pipe:false
|
|
|
1392 |
clientName:checkInDefinition workSpaceName.
|
|
|
1393 |
result ifFalse:[
|
|
|
1394 |
('PerforceSourceCodeManager [error]: failed to add ', checkoutName) errorPrintCR.
|
|
|
1395 |
^ false
|
|
|
1396 |
].
|
|
|
1397 |
^ self submitModule:moduleName inDirectory:checkInDefinition tempDirectory logMessage:logMsg workSpaceDefinition:checkInDefinition workSpaceDefinition.
|
|
|
1398 |
!
|
|
|
1399 |
|
|
|
1400 |
mergeOrResolveConflictsFor:checkInDefinition
|
|
|
1401 |
|
|
|
1402 |
|modulePath checkoutName classFileName packageDir moduleName logMsg force class fileNameAndRev cmd result tempdir workSpaceName
|
|
|
1403 |
changesDict words fullFileName inStream line chunksPart s mySource mergedSource localRevision resultSource changesAsLogged msg
|
|
|
1404 |
answer checkInRepaired emphasizedText emSep diffTextComment didAccept editor repairedText|
|
|
|
1405 |
|
|
|
1406 |
modulePath := checkInDefinition modulePath.
|
|
|
1407 |
checkoutName := checkInDefinition checkoutName.
|
|
|
1408 |
classFileName := checkInDefinition classFileName.
|
|
|
1409 |
class := checkInDefinition definitionClass.
|
|
|
1410 |
packageDir := checkInDefinition packageDir.
|
|
|
1411 |
tempdir := checkInDefinition tempDirectory.
|
|
|
1412 |
moduleName := checkInDefinition moduleName.
|
|
|
1413 |
logMsg := checkInDefinition logMessage.
|
|
|
1414 |
force := checkInDefinition force.
|
|
|
1415 |
workSpaceName := checkInDefinition workSpaceName.
|
|
|
1416 |
localRevision := checkInDefinition getLocalRevision.
|
|
|
1417 |
fullFileName := tempdir construct:checkoutName.
|
|
|
1418 |
|
|
|
1419 |
fileNameAndRev := checkoutName, '#', localRevision printString.
|
|
|
1420 |
|
|
|
1421 |
|
|
|
1422 |
" first we need a sync to get resolve notification "
|
|
|
1423 |
cmd := ('sync -f ' , fileNameAndRev).
|
|
|
1424 |
result := self executePerforceCommand:cmd
|
|
|
1425 |
module:moduleName
|
|
|
1426 |
inDirectory:tempdir
|
|
|
1427 |
log:true
|
|
|
1428 |
pipe:false
|
|
|
1429 |
clientName:workSpaceName.
|
|
|
1430 |
result ifFalse:[
|
|
|
1431 |
('PerforceSourceCodeManager [error]: could not sync ', checkoutName) errorPrintCR.
|
|
|
1432 |
^ false
|
|
|
1433 |
].
|
|
|
1434 |
cmd := ('edit ' , checkoutName).
|
|
|
1435 |
result := self executePerforceCommand:cmd
|
|
|
1436 |
module:moduleName
|
|
|
1437 |
inDirectory:tempdir
|
|
|
1438 |
log:true
|
|
|
1439 |
pipe:false
|
|
|
1440 |
clientName:workSpaceName.
|
|
|
1441 |
result ifFalse:[
|
|
|
1442 |
('PerforceSourceCodeManager [error]: could not sync ', checkoutName) errorPrintCR.
|
|
|
1443 |
^ false
|
|
|
1444 |
].
|
|
|
1445 |
|
|
|
1446 |
"write my code"
|
|
|
1447 |
s := fullFileName writeStream.
|
|
|
1448 |
self fileOutSourceCodeOf:class on:s.
|
|
|
1449 |
s close.
|
|
|
1450 |
"before resolving we need a sync"
|
|
|
1451 |
cmd := ('sync ' , checkoutName).
|
|
|
1452 |
result := self executePerforceCommand:cmd
|
|
|
1453 |
module:moduleName
|
|
|
1454 |
inDirectory:tempdir
|
|
|
1455 |
log:true
|
|
|
1456 |
pipe:false
|
|
|
1457 |
clientName:workSpaceName.
|
|
|
1458 |
result ifFalse:[
|
|
|
1459 |
('PerforceSourceCodeManager [error]: could not sync ', checkoutName) errorPrintCR.
|
|
|
1460 |
^ false
|
|
|
1461 |
].
|
|
|
1462 |
|
|
|
1463 |
cmd := ('resolve -af ' , checkoutName).
|
|
|
1464 |
inStream := self executePerforceCommand:cmd
|
|
|
1465 |
module:moduleName
|
|
|
1466 |
inDirectory:tempdir
|
|
|
1467 |
log:true
|
|
|
1468 |
pipe:true
|
|
|
1469 |
clientName:workSpaceName.
|
|
|
1470 |
|
|
|
1471 |
|
|
|
1472 |
inStream isNil ifTrue:[
|
|
|
1473 |
('PerforceSourceCodeManager [error]: could not get Stream when resolving ', checkoutName) errorPrintCR.
|
|
|
1474 |
^ false
|
|
|
1475 |
].
|
|
|
1476 |
"check if we have conflicts"
|
|
|
1477 |
changesAsLogged := StringCollection new.
|
|
|
1478 |
[inStream atEnd not] whileTrue:[
|
|
|
1479 |
line:= inStream nextLine.
|
|
|
1480 |
line notNil ifTrue:[
|
|
|
1481 |
(line startsWith:'Diff chunks:') ifTrue:[
|
|
|
1482 |
changesAsLogged add:line.
|
|
|
1483 |
changesDict := Dictionary new.
|
|
|
1484 |
chunksPart := line copyFrom:('Diff chunks:' size + 1).
|
|
|
1485 |
(chunksPart asCollectionOfSubstringsSeparatedBy:$+) do:[:eachElement|
|
|
|
1486 |
words := eachElement asCollectionOfWords.
|
|
|
1487 |
changesDict at:words second asSymbol put:words first asNumber.
|
|
|
1488 |
].
|
|
|
1489 |
].
|
|
|
1490 |
].
|
|
|
1491 |
].
|
|
|
1492 |
s := WriteStream on:String new.
|
|
|
1493 |
self fileOutSourceCodeOf:class on:s.
|
|
|
1494 |
mergedSource := fullFileName readStream contents asString.
|
|
|
1495 |
mySource := s contents asString.
|
|
|
1496 |
(changesDict notNil and:[(changesDict at:#conflicting) > 0]) ifTrue:[
|
|
|
1497 |
"ooops must resolve conflicts"
|
|
|
1498 |
msg := self messageForConflictsInClass:class revision:localRevision.
|
|
|
1499 |
answer := self checkinTroubleDialog:'Version conflict'
|
|
|
1500 |
message:msg
|
|
|
1501 |
log:changesAsLogged
|
|
|
1502 |
abortable:false
|
|
|
1503 |
option:'show conflicts'
|
|
|
1504 |
option2:'resolve conflicts'.
|
|
|
1505 |
|
|
|
1506 |
answer == #option ifTrue:[
|
|
|
1507 |
"/
|
|
|
1508 |
"/ show conflicts in a 3-way DiffTextView ...
|
|
|
1509 |
"/
|
|
|
1510 |
Diff3TextView
|
|
|
1511 |
openOnMergedText:mergedSource
|
|
|
1512 |
label:'your version (checkin attempt)'
|
|
|
1513 |
label:'original (base version)'
|
|
|
1514 |
label:'newest repository version'.
|
|
|
1515 |
].
|
|
|
1516 |
|
|
|
1517 |
checkInRepaired := false.
|
|
|
1518 |
answer == #option2 ifTrue:[
|
|
|
1519 |
"/
|
|
|
1520 |
"/ allow checkin of repair version
|
|
|
1521 |
"/ this is error prone ...
|
|
|
1522 |
"/
|
|
|
1523 |
"/
|
|
|
1524 |
"/ show merged version in an editor ...
|
|
|
1525 |
"/ ... accept will check it in.
|
|
|
1526 |
"/
|
|
|
1527 |
emphasizedText := mergedSource asStringCollection.
|
|
|
1528 |
emSep := (Array with:(#color->Color black)
|
|
|
1529 |
with:(#backgroundColor->Color green)).
|
|
|
1530 |
emphasizedText := Diff3TextView
|
|
|
1531 |
emphasizeMergedDiff3TextPerorce:emphasizedText
|
|
|
1532 |
origEmphasize:(Array with:(#color->Color black)
|
|
|
1533 |
with:(#backgroundColor->Color yellow))
|
|
|
1534 |
otherEmphasize:(Array with:(#color->Color white)
|
|
|
1535 |
with:(#backgroundColor->Color red))
|
|
|
1536 |
yourEmphasize:(Array with:(#color->Color white)
|
|
|
1537 |
with:(#backgroundColor->Color red))
|
|
|
1538 |
separatorEmphasize:emSep.
|
|
|
1539 |
|
|
|
1540 |
diffTextComment := self diffTextComment.
|
|
|
1541 |
diffTextComment := (Text string:diffTextComment emphasis:emSep) asStringCollection.
|
|
|
1542 |
emphasizedText := diffTextComment , emphasizedText.
|
|
|
1543 |
|
|
|
1544 |
didAccept := false. checkInRepaired := true.
|
|
|
1545 |
[didAccept not and:[checkInRepaired]] whileTrue:[
|
|
|
1546 |
editor := RCSConflictEditTextView
|
|
|
1547 |
setupWith:emphasizedText
|
|
|
1548 |
title:'Resolve conflicts in ' , checkoutName , ', then accept & close to checkin'.
|
|
|
1549 |
|
|
|
1550 |
editor acceptAction:[:dummy |
|
|
|
1551 |
repairedText := editor list.
|
|
|
1552 |
didAccept := true.
|
|
|
1553 |
].
|
|
|
1554 |
didAccept := false.
|
|
|
1555 |
editor topView openModal.
|
|
|
1556 |
|
|
|
1557 |
didAccept ifFalse:[
|
|
|
1558 |
(Dialog confirm:'You did not accept the new text. Edit again ?')
|
|
|
1559 |
ifFalse:[
|
|
|
1560 |
checkInRepaired := false.
|
|
|
1561 |
]
|
|
|
1562 |
] ifTrue:[
|
|
|
1563 |
"/ check if all green-stuff (separators) have been removed
|
|
|
1564 |
(repairedText findFirst:[:line | line notNil and:[line notEmpty and:[(line emphasisAt:1) = emSep]]]) ~~ 0 ifTrue:[
|
|
|
1565 |
self warn:'You have to look at ALL conflicts, and remove ALL green lines as a confirmation !!'.
|
|
|
1566 |
didAccept := false.
|
|
|
1567 |
]
|
|
|
1568 |
].
|
|
|
1569 |
].
|
|
|
1570 |
resultSource := repairedText asString string.
|
|
|
1571 |
].
|
|
|
1572 |
|
|
|
1573 |
checkInRepaired ifTrue:[
|
|
|
1574 |
Transcript showCR:'checking in ' , checkoutName , ' (manually repaired version) ...'
|
|
|
1575 |
] ifFalse:[
|
|
|
1576 |
'PerforceSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
|
|
|
1577 |
Transcript showCR:'checkin of ' , checkoutName , ' aborted (conflicting changes; repository unchanged)'.
|
|
|
1578 |
^ true.
|
|
|
1579 |
]
|
|
|
1580 |
] ifFalse:[
|
|
|
1581 |
mySource = mergedSource ifTrue:[
|
|
|
1582 |
msg := self messageForNoChangesInClass:class.
|
|
|
1583 |
self checkinTroubleDialog:'Merging versions'
|
|
|
1584 |
message:msg
|
|
|
1585 |
log:changesAsLogged
|
|
|
1586 |
abortable:false
|
|
|
1587 |
option:nil.
|
|
|
1588 |
] ifFalse:[
|
|
|
1589 |
msg := self messageForChangesInClass:class revision:localRevision.
|
|
|
1590 |
answer := self checkinTroubleDialog:'Merging versions'
|
|
|
1591 |
message:msg
|
|
|
1592 |
log:changesAsLogged
|
|
|
1593 |
abortable:true
|
|
|
1594 |
option:'Stop - see first'.
|
|
|
1595 |
answer ~~ true ifTrue:[
|
|
|
1596 |
answer == #option ifTrue:[
|
|
|
1597 |
DiffCodeView
|
|
|
1598 |
openOn:mySource
|
|
|
1599 |
label:'current version'
|
|
|
1600 |
and:mergedSource
|
|
|
1601 |
label:'merged version'.
|
|
|
1602 |
|
|
|
1603 |
].
|
|
|
1604 |
Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
|
|
|
1605 |
^ false.
|
|
|
1606 |
].
|
|
|
1607 |
resultSource := mergedSource.
|
|
|
1608 |
].
|
|
|
1609 |
].
|
|
|
1610 |
"now we have a merge - lets get latest revision and write on it "
|
|
|
1611 |
cmd := ('revert ' , checkoutName).
|
|
|
1612 |
result := self executePerforceCommand:cmd
|
|
|
1613 |
module:moduleName
|
|
|
1614 |
inDirectory:tempdir
|
|
|
1615 |
log:true
|
|
|
1616 |
pipe:false
|
|
|
1617 |
clientName:workSpaceName.
|
|
|
1618 |
result ifFalse:[
|
|
|
1619 |
('PerforceSourceCodeManager [error]: could not revert ', checkoutName) errorPrintCR.
|
|
|
1620 |
^ false
|
|
|
1621 |
].
|
|
|
1622 |
|
|
|
1623 |
fullFileName remove.
|
|
|
1624 |
cmd := ('sync -f ' , checkoutName).
|
|
|
1625 |
result := self executePerforceCommand:cmd
|
|
|
1626 |
module:moduleName
|
|
|
1627 |
inDirectory:tempdir
|
|
|
1628 |
log:true
|
|
|
1629 |
pipe:false
|
|
|
1630 |
clientName:workSpaceName.
|
|
|
1631 |
result ifFalse:[
|
|
|
1632 |
('PerforceSourceCodeManager [error]: could not sync ', checkoutName) errorPrintCR.
|
|
|
1633 |
^ false
|
|
|
1634 |
].
|
|
|
1635 |
cmd := ('edit ' , checkoutName).
|
|
|
1636 |
result := self executePerforceCommand:cmd
|
|
|
1637 |
module:moduleName
|
|
|
1638 |
inDirectory:tempdir
|
|
|
1639 |
log:true
|
|
|
1640 |
pipe:false
|
|
|
1641 |
clientName:workSpaceName.
|
|
|
1642 |
result ifFalse:[
|
|
|
1643 |
('PerforceSourceCodeManager [error]: could not edit ', checkoutName) errorPrintCR.
|
|
|
1644 |
^ false
|
|
|
1645 |
].
|
|
|
1646 |
"write my result"
|
|
|
1647 |
s := fullFileName writeStream.
|
|
|
1648 |
s nextPutAll:resultSource.
|
|
|
1649 |
s close.
|
|
|
1650 |
|
|
|
1651 |
^ self submitModule:moduleName inDirectory:tempdir logMessage:logMsg workSpaceDefinition:checkInDefinition workSpaceDefinition.
|
|
|
1652 |
!
|
|
|
1653 |
|
|
|
1654 |
messageForChangesInClass:class revision:revisionNumber
|
|
|
1655 |
|
|
|
1656 |
|msgStream|
|
|
|
1657 |
|
|
|
1658 |
msgStream := WriteStream on:''.
|
|
|
1659 |
msgStream nextPutAll:'The source of '; nextPutAll:class className; nextPutAll:'has been changed in the meanwhile as listed below.'.
|
|
|
1660 |
msgStream cr.
|
|
|
1661 |
msgStream nextPutAll:'If you continue, your new changes (based upon rev. '; nextPutAll:revisionNumber printString; nextPutAll:') will be MERGED'.
|
|
|
1662 |
msgStream nextPutAll:'into the newest revision. This will combine the other version with your changes'.
|
|
|
1663 |
msgStream nextPutAll:'into a new common revision which may be different from both.'.
|
|
|
1664 |
msgStream nextPutAll:'Although this is a nice feature, it may fail to create the expected result in certain situations.'.
|
|
|
1665 |
msgStream cr.
|
|
|
1666 |
msgStream nextPutAll:'You should carefully check the result - by comparing the current version with the'.
|
|
|
1667 |
msgStream nextPutAll:'most recent version in the repository. If that does not contain an acceptable version,'.
|
|
|
1668 |
msgStream nextPutAll:'change methods as required and check in again.'.
|
|
|
1669 |
msgStream nextPutAll:'Be aware, that after that, the actual repository version is different from your current classes,'.
|
|
|
1670 |
msgStream nextPutAll:'and you should update your class from the repository.'.
|
|
|
1671 |
msgStream cr.
|
|
|
1672 |
msgStream nextPutAll:'Continue ?'.
|
|
|
1673 |
^ msgStream contents
|
|
|
1674 |
!
|
|
|
1675 |
|
|
|
1676 |
messageForConflictsInClass:class revision:revisionNumber
|
|
|
1677 |
|
|
|
1678 |
|msgStream|
|
|
|
1679 |
|
|
|
1680 |
msgStream := WriteStream on:''.
|
|
|
1681 |
msgStream nextPutAll:'The source of '; nextPutAll:class className; nextPutAll:'has been changed in the meanwhile as listed below.'.
|
|
|
1682 |
msgStream cr.
|
|
|
1683 |
msgStream nextPutAll:'Your new changes (based upon rev. '; nextPutAll:revisionNumber printString; nextPutAll:') CONFLICT with those changes'.
|
|
|
1684 |
msgStream cr.
|
|
|
1685 |
msgStream nextPutAll:'You should fix things by comparing your class with the most recent repository version'.
|
|
|
1686 |
msgStream nextPutAll:'and change your methods avoiding conflicts. The checkin again.'.
|
|
|
1687 |
msgStream cr.
|
|
|
1688 |
^ msgStream contents
|
|
|
1689 |
!
|
|
|
1690 |
|
|
|
1691 |
messageForNoChangesInClass:class
|
|
|
1692 |
|
|
|
1693 |
|msgStream|
|
|
|
1694 |
|
|
|
1695 |
msgStream := WriteStream on:''.
|
|
|
1696 |
msgStream nextPutAll:'The source of '; nextPutAll:class className; nextPutAll:'has been changed in the meanwhile as listed below.'.
|
|
|
1697 |
msgStream cr.
|
|
|
1698 |
msgStream nextPutAll:'I have merged your version with the newest repository version,'.
|
|
|
1699 |
msgStream nextPutAll:'and found no differences between the result and your current version'.
|
|
|
1700 |
msgStream nextPutAll:'(i.e. your version seemed up-to-date).'.
|
|
|
1701 |
^ msgStream contents
|
|
|
1702 |
!
|
|
|
1703 |
|
|
|
1704 |
postCheckInClass:class checkInDefinition:checkInDefinition
|
|
|
1705 |
|
|
|
1706 |
|newestRevisionAfterSubmit checkoutName localRevision newRevisionLog|
|
|
|
1707 |
|
|
|
1708 |
checkoutName := checkInDefinition checkoutName.
|
|
|
1709 |
localRevision := checkInDefinition getLocalRevision asNumber.
|
|
|
1710 |
checkInDefinition newestRevision:nil.
|
|
|
1711 |
newestRevisionAfterSubmit := checkInDefinition getNewestRevisionNumber.
|
|
|
1712 |
newestRevisionAfterSubmit isNil ifTrue:[
|
|
|
1713 |
('PerforceSourceCodeManager [error]: failed to get revision log after checkin for ', checkoutName) errorPrintCR.
|
|
|
1714 |
^ false
|
|
|
1715 |
].
|
|
|
1716 |
newestRevisionAfterSubmit > localRevision ifTrue:[
|
|
|
1717 |
newRevisionLog := self updatedRevisionStringOf:class forRevision:newestRevisionAfterSubmit with:class revisionInfo getVersionString.
|
|
|
1718 |
class updateVersionMethodFor:newRevisionLog.
|
|
|
1719 |
class revision ~= newestRevisionAfterSubmit asString ifTrue:[
|
|
|
1720 |
'PerforceSourceCodeManager [error]: failed to update revisionString' errorPrintCR.
|
|
|
1721 |
^ false
|
|
|
1722 |
]
|
|
|
1723 |
] ifFalse:[
|
|
|
1724 |
self error:'ooops no new version ????'.
|
|
|
1725 |
self postCheckInClass:class.
|
|
|
1726 |
].
|
|
|
1727 |
^ true
|
|
|
1728 |
!
|
|
|
1729 |
|
|
|
1730 |
standardCheckinFor:checkInDefinition localRevision:locRevision
|
|
|
1731 |
|
|
|
1732 |
|modulePath checkoutName fullFileName classFileName packageDir moduleName
|
|
|
1733 |
logMsg force s class cmd result fileNameAndRev tempdir workSpaceName fullFileNameAndRev
|
|
|
1734 |
workSpaceDefinition newestRevision|
|
|
|
1735 |
|
|
|
1736 |
modulePath := checkInDefinition modulePath.
|
|
|
1737 |
checkoutName := checkInDefinition checkoutName.
|
|
|
1738 |
classFileName := checkInDefinition classFileName.
|
|
|
1739 |
class := checkInDefinition definitionClass.
|
|
|
1740 |
packageDir := checkInDefinition packageDir.
|
|
|
1741 |
moduleName := checkInDefinition moduleName.
|
|
|
1742 |
newestRevision := checkInDefinition newestRevision.
|
|
|
1743 |
logMsg := checkInDefinition logMessage.
|
|
|
1744 |
force := checkInDefinition force.
|
|
|
1745 |
tempdir := checkInDefinition tempDirectory.
|
|
|
1746 |
workSpaceName := checkInDefinition workSpaceName.
|
|
|
1747 |
workSpaceDefinition := checkInDefinition workSpaceDefinition.
|
|
|
1748 |
fullFileName := tempdir construct:checkoutName.
|
|
|
1749 |
|
|
|
1750 |
fileNameAndRev := checkoutName, '#', newestRevision printString.
|
|
|
1751 |
|
|
|
1752 |
|
|
|
1753 |
cmd := ('sync ' , fileNameAndRev).
|
|
|
1754 |
result := self executePerforceCommand:cmd
|
|
|
1755 |
module:moduleName
|
|
|
1756 |
inDirectory:tempdir
|
|
|
1757 |
log:true
|
|
|
1758 |
pipe:false
|
|
|
1759 |
clientName:workSpaceName.
|
|
|
1760 |
fullFileNameAndRev := tempdir construct:fileNameAndRev.
|
|
|
1761 |
fullFileName copyTo:fullFileNameAndRev.
|
|
|
1762 |
|
|
|
1763 |
cmd := ('edit ' , checkoutName).
|
|
|
1764 |
result := self executePerforceCommand:cmd
|
|
|
1765 |
module:moduleName
|
|
|
1766 |
inDirectory:tempdir
|
|
|
1767 |
log:true
|
|
|
1768 |
pipe:false
|
|
|
1769 |
clientName:workSpaceName.
|
|
|
1770 |
result ifFalse:[
|
|
|
1771 |
('PerforceSourceCodeManager [error]: failed to edit ', checkoutName) errorPrintCR.
|
|
|
1772 |
^ false
|
|
|
1773 |
].
|
|
|
1774 |
s := fullFileName writeStream.
|
|
|
1775 |
self fileOutSourceCodeOf:class on:s.
|
|
|
1776 |
s close.
|
|
|
1777 |
result := self submitModule:moduleName inDirectory:tempdir logMessage:checkInDefinition logMessage workSpaceDefinition:workSpaceDefinition.
|
|
|
1778 |
result ifFalse:[
|
|
|
1779 |
('PerforceSourceCodeManager [error]: failed to edit ', checkoutName) errorPrintCR.
|
|
|
1780 |
^ false
|
|
|
1781 |
].
|
|
|
1782 |
^ true
|
|
|
1783 |
!
|
|
|
1784 |
|
|
|
1785 |
submitModule:moduleDir inDirectory:inDirectory logMessage:logMessage workSpaceDefinition:workSpaceDefinition
|
|
|
1786 |
|
|
|
1787 |
|cmd changeListStream result workSpaceName changeListFile inStream logLines line lastLineWasFiles elements changes currentDefinition currentContent changeFiles readStream|
|
|
|
1788 |
|
|
|
1789 |
workSpaceName := workSpaceDefinition at:#workSpaceName ifAbsent:nil.
|
|
|
1790 |
cmd := 'change -o'.
|
|
|
1791 |
inStream := self executePerforceCommand:cmd
|
|
|
1792 |
module:moduleDir
|
|
|
1793 |
inDirectory:inDirectory
|
|
|
1794 |
log:true
|
|
|
1795 |
pipe:true
|
|
|
1796 |
clientName:workSpaceName.
|
|
|
1797 |
|
|
|
1798 |
inStream isNil ifTrue:[
|
|
|
1799 |
('PerforceSourceCodeManager [error]: could not get Stream from ', cmd) errorPrintCR.
|
|
|
1800 |
^ false
|
|
|
1801 |
].
|
|
|
1802 |
changes := Dictionary new.
|
|
|
1803 |
logLines := logMessage asStringCollection.
|
|
|
1804 |
changeListFile := inDirectory construct:'change'.
|
|
|
1805 |
changeListStream := changeListFile writeStream.
|
|
|
1806 |
lastLineWasFiles := false.
|
|
|
1807 |
[inStream atEnd not] whileTrue:[
|
|
|
1808 |
line:= inStream nextLine.
|
|
|
1809 |
line notNil ifTrue:[
|
|
|
1810 |
(line notEmpty and:[line first isSeparator or:[line first = $#]]) ifTrue:[
|
|
|
1811 |
currentContent := line.
|
|
|
1812 |
] ifFalse:[
|
|
|
1813 |
elements := line asCollectionOfSubstringsSeparatedBy:$:.
|
|
|
1814 |
elements size > 1 ifTrue:[
|
|
|
1815 |
currentDefinition := elements first.
|
|
|
1816 |
currentContent := (line copyFrom:currentDefinition size + 2).
|
|
|
1817 |
] ifFalse:[
|
|
|
1818 |
currentContent := line.
|
|
|
1819 |
].
|
|
|
1820 |
].
|
|
|
1821 |
(currentDefinition notNil and:[currentDefinition = 'Files' and:[currentContent notEmptyOrNil]]) ifTrue:[
|
|
|
1822 |
elements := currentContent asCollectionOfWords.
|
|
|
1823 |
elements size > 2 ifTrue:[
|
|
|
1824 |
changeFiles := changes at:elements second ifAbsent:nil.
|
|
|
1825 |
changeFiles isNil ifTrue:[
|
|
|
1826 |
changeFiles := OrderedCollection new.
|
|
|
1827 |
changes at:elements third put:changeFiles.
|
|
|
1828 |
].
|
|
|
1829 |
changeFiles add:elements first.
|
|
|
1830 |
].
|
|
|
1831 |
].
|
|
|
1832 |
(line includesString:'<enter description here>') ifTrue:[
|
|
|
1833 |
logLines do:[:aLine|
|
|
|
1834 |
changeListStream nextPut:Character tab.
|
|
|
1835 |
changeListStream nextPutLine:aLine.
|
|
|
1836 |
].
|
|
|
1837 |
] ifFalse:[
|
|
|
1838 |
changeListStream nextPutLine:line.
|
|
|
1839 |
].
|
|
|
1840 |
].
|
|
|
1841 |
].
|
|
|
1842 |
changeListStream close.
|
|
|
1843 |
readStream := changeListFile contents asString readStream.
|
|
|
1844 |
cmd := ('submit -f submitunchanged -i ').
|
|
|
1845 |
result := self executePerforceCommand:cmd
|
|
|
1846 |
module:moduleDir
|
|
|
1847 |
inDirectory:inDirectory
|
|
|
1848 |
log:true
|
|
|
1849 |
pipe:false
|
|
|
1850 |
clientName:workSpaceName
|
|
|
1851 |
inputFrom:readStream.
|
|
|
1852 |
result ifFalse:[
|
|
|
1853 |
('PerforceSourceCodeManager [error]: could not submit ', cmd) errorPrintCR.
|
|
|
1854 |
].
|
|
|
1855 |
^ result
|
|
|
1856 |
!
|
|
|
1857 |
|
|
|
1858 |
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
|
|
|
1859 |
"update a revision string"
|
|
|
1860 |
|
|
|
1861 |
|versionInfo|
|
|
|
1862 |
|
|
|
1863 |
originalVersionString isEmptyOrNil ifTrue:[^ nil].
|
|
|
1864 |
versionInfo := PerforceVersionInfo fromRCSString:originalVersionString.
|
|
|
1865 |
versionInfo revision:newRevision printString.
|
|
|
1866 |
^ versionInfo getVersionString.
|
|
|
1867 |
|
|
|
1868 |
|
|
|
1869 |
|
|
|
1870 |
"
|
|
|
1871 |
self updatedRevisionStringOf:nil
|
|
|
1872 |
forRevision:'6'
|
|
|
1873 |
with:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.1 2011-04-19 08:32:36 cg Exp $'
|
|
|
1874 |
"
|
|
|
1875 |
! !
|
|
|
1876 |
|
|
|
1877 |
!PerforceSourceCodeManager class methodsFor:'queries'!
|
|
|
1878 |
|
|
|
1879 |
getPerforceClientForModule:aModuleName
|
|
|
1880 |
|
|
|
1881 |
| settings settingsString|
|
|
|
1882 |
|
|
|
1883 |
aModuleName isNil ifTrue:[^ nil].
|
|
|
1884 |
settingsString := self getPerforceSettingsForModule:aModuleName.
|
|
|
1885 |
settingsString isNil ifTrue:[^ PerforceClient].
|
|
|
1886 |
settings := self getPerforceSettingsFromString:settingsString.
|
|
|
1887 |
^ settings at:#client ifAbsent:PerforceClient.
|
|
|
1888 |
!
|
|
|
1889 |
|
|
|
1890 |
getPerforceDefaultSettingsString
|
|
|
1891 |
|
|
|
1892 |
^(PerforceSourceCodeManager perforceClient ,':',
|
|
|
1893 |
PerforceSourceCodeManager perforceUser, ':',
|
|
|
1894 |
(PerforceSourceCodeManager perforcePassword ? 'pass'), '@',
|
|
|
1895 |
PerforceSourceCodeManager perforcePort).
|
|
|
1896 |
!
|
|
|
1897 |
|
|
|
1898 |
getPerforcePasswordForModule:aModuleName
|
|
|
1899 |
|
|
|
1900 |
| settings settingsString|
|
|
|
1901 |
|
|
|
1902 |
aModuleName isNil ifTrue:[^ nil].
|
|
|
1903 |
settingsString := self getPerforceSettingsForModule:aModuleName.
|
|
|
1904 |
settingsString isNil ifTrue:[^ PerforcePassword].
|
|
|
1905 |
settings := self getPerforceSettingsFromString:settingsString.
|
|
|
1906 |
^ settings at:#password ifAbsent:PerforcePassword.
|
|
|
1907 |
!
|
|
|
1908 |
|
|
|
1909 |
getPerforcePortForModule:aModuleName
|
|
|
1910 |
|
|
|
1911 |
| settings settingsString|
|
|
|
1912 |
|
|
|
1913 |
aModuleName isNil ifTrue:[^ nil].
|
|
|
1914 |
settingsString := self getPerforceSettingsForModule:aModuleName.
|
|
|
1915 |
settingsString isNil ifTrue:[^ PerforcePort].
|
|
|
1916 |
settings := self getPerforceSettingsFromString:settingsString.
|
|
|
1917 |
^ settings at:#port ifAbsent:PerforcePort.
|
|
|
1918 |
!
|
|
|
1919 |
|
|
|
1920 |
getPerforceSettingsForModule:aModuleName
|
|
|
1921 |
|
|
|
1922 |
|settingsString|
|
|
|
1923 |
|
|
|
1924 |
PerforceModuleRoots isNil ifTrue:[^ nil].
|
|
|
1925 |
aModuleName isNil ifTrue:[^ nil].
|
|
|
1926 |
settingsString := PerforceModuleRoots at:aModuleName ifAbsent:nil.
|
|
|
1927 |
settingsString isNil ifTrue:[^ nil].
|
|
|
1928 |
^ self getPerforceSettingsFromString:settingsString.
|
|
|
1929 |
!
|
|
|
1930 |
|
|
|
1931 |
getPerforceSettingsFromString:aString
|
|
|
1932 |
|
|
|
1933 |
|clientAndPort noOfClientAndPortElements userAndClientAndPassword noOfUserAndClient settings |
|
|
|
1934 |
|
|
|
1935 |
settings := Dictionary new.
|
|
|
1936 |
clientAndPort := aString asCollectionOfSubstringsSeparatedBy:$@.
|
|
|
1937 |
noOfClientAndPortElements := clientAndPort size.
|
|
|
1938 |
noOfClientAndPortElements > 0 ifTrue:[
|
|
|
1939 |
userAndClientAndPassword := clientAndPort first asCollectionOfSubstringsSeparatedBy:$:.
|
|
|
1940 |
noOfUserAndClient := userAndClientAndPassword size.
|
|
|
1941 |
noOfUserAndClient > 0 ifTrue:[
|
|
|
1942 |
settings at:#client put:userAndClientAndPassword first.
|
|
|
1943 |
].
|
|
|
1944 |
noOfUserAndClient > 1 ifTrue:[
|
|
|
1945 |
settings at:#user put:userAndClientAndPassword second.
|
|
|
1946 |
].
|
|
|
1947 |
noOfUserAndClient > 2 ifTrue:[
|
|
|
1948 |
settings at:#password put:userAndClientAndPassword third.
|
|
|
1949 |
].
|
|
|
1950 |
].
|
|
|
1951 |
noOfClientAndPortElements > 1 ifTrue:[
|
|
|
1952 |
settings at:#port put:clientAndPort second.
|
|
|
1953 |
].
|
|
|
1954 |
^ settings
|
|
|
1955 |
!
|
|
|
1956 |
|
|
|
1957 |
getPerforceUserForModule:aModuleName
|
|
|
1958 |
|
|
|
1959 |
| settings settingsString|
|
|
|
1960 |
|
|
|
1961 |
aModuleName isNil ifTrue:[^ nil].
|
|
|
1962 |
settingsString := self getPerforceSettingsForModule:aModuleName.
|
|
|
1963 |
settingsString isNil ifTrue:[^ PerforcePassword].
|
|
|
1964 |
settings := self getPerforceSettingsFromString:settingsString.
|
|
|
1965 |
^ settings at:#password ifAbsent:PerforcePassword.
|
|
|
1966 |
!
|
|
|
1967 |
|
|
|
1968 |
isPerforce
|
|
|
1969 |
"Superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
|
|
|
1970 |
|
|
|
1971 |
^ true
|
|
|
1972 |
!
|
|
|
1973 |
|
|
|
1974 |
managerTypeName
|
|
|
1975 |
"Superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
|
|
|
1976 |
|
|
|
1977 |
^ 'Perforce'
|
|
|
1978 |
!
|
|
|
1979 |
|
|
|
1980 |
nameOfVersionMethodForExtensions
|
|
|
1981 |
^ #'extensionsVersion_P4'
|
|
|
1982 |
!
|
|
|
1983 |
|
|
|
1984 |
nameOfVersionMethodInClasses
|
|
|
1985 |
^ #'version_P4'
|
|
|
1986 |
!
|
|
|
1987 |
|
|
|
1988 |
perforceTmpDirectory
|
|
|
1989 |
"return the name of the tmp repository.
|
|
|
1990 |
Thats the directory, where temporary files are created for checkin/checkout.
|
|
|
1991 |
If nil, the systems default tempDirectory is used."
|
|
|
1992 |
|
|
|
1993 |
^ (PerforceTempDir ? Filename tempDirectory pathName)
|
|
|
1994 |
|
|
|
1995 |
"
|
|
|
1996 |
PerforceTempDir := nil
|
|
|
1997 |
"
|
|
|
1998 |
! !
|
|
|
1999 |
|
|
|
2000 |
!PerforceSourceCodeManager class methodsFor:'source code administration'!
|
|
|
2001 |
|
|
|
2002 |
getExistingContainersInModule:aModule directory:aPackage
|
|
|
2003 |
"{ Pragma: +optSpace }"
|
|
|
2004 |
|
|
|
2005 |
self shouldImplement
|
|
|
2006 |
!
|
|
|
2007 |
|
|
|
2008 |
getExistingDirectoriesInModule:aModule
|
|
|
2009 |
"{ Pragma: +optSpace }"
|
|
|
2010 |
|
|
|
2011 |
self shouldImplement
|
|
|
2012 |
!
|
|
|
2013 |
|
|
|
2014 |
getExistingModules
|
|
|
2015 |
"{ Pragma: +optSpace }"
|
|
|
2016 |
|
|
|
2017 |
self shouldImplement
|
|
|
2018 |
!
|
|
|
2019 |
|
|
|
2020 |
revisionInfoFromString:aString
|
|
|
2021 |
"{ Pragma: +optSpace }"
|
|
|
2022 |
|
|
|
2023 |
^ PerforceVersionInfo fromRCSString:aString.
|
|
|
2024 |
|
|
|
2025 |
"
|
|
|
2026 |
|stream|
|
|
|
2027 |
stream := WriteStream on:''.
|
|
|
2028 |
SourceCodeManagerUtilities repositoryLogOf:ExtIF onto:stream.
|
|
|
2029 |
^ stream contents.
|
|
|
2030 |
"
|
|
|
2031 |
!
|
|
|
2032 |
|
|
|
2033 |
revisionLogOf:clsOrNil numberOfRevisions:numRevisions fileName:classFileName directory:packageDir module:moduleDir
|
|
|
2034 |
^ self
|
|
|
2035 |
revisionLogOf:clsOrNil
|
|
|
2036 |
fromRevision:nil
|
|
|
2037 |
toRevision:nil
|
|
|
2038 |
numberOfRevisions:numRevisions
|
|
|
2039 |
fileName:classFileName
|
|
|
2040 |
directory:packageDir
|
|
|
2041 |
module:moduleDir
|
|
|
2042 |
! !
|
|
|
2043 |
|
|
|
2044 |
!PerforceSourceCodeManager class methodsFor:'subclass responsibility'!
|
|
|
2045 |
|
|
|
2046 |
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:repositoryFilter filterModules:moduleFilter inTo:aBlock
|
|
|
2047 |
"Superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
|
|
|
2048 |
|
|
|
2049 |
self shouldImplement
|
|
|
2050 |
! !
|
|
|
2051 |
|
|
|
2052 |
!PerforceSourceCodeManager::CheckInDefinition methodsFor:'accessing'!
|
|
|
2053 |
|
|
|
2054 |
classFileName
|
|
|
2055 |
^ classFileName
|
|
|
2056 |
!
|
|
|
2057 |
|
|
|
2058 |
classFileName:something
|
|
|
2059 |
classFileName := something.
|
|
|
2060 |
!
|
|
|
2061 |
|
|
|
2062 |
definitionClass
|
|
|
2063 |
^ definitionClass
|
|
|
2064 |
!
|
|
|
2065 |
|
|
|
2066 |
definitionClass:something
|
|
|
2067 |
definitionClass := something.
|
|
|
2068 |
!
|
|
|
2069 |
|
|
|
2070 |
force
|
|
|
2071 |
^ force
|
|
|
2072 |
!
|
|
|
2073 |
|
|
|
2074 |
force:something
|
|
|
2075 |
force := something.
|
|
|
2076 |
!
|
|
|
2077 |
|
|
|
2078 |
logMessage
|
|
|
2079 |
^ logMessage
|
|
|
2080 |
!
|
|
|
2081 |
|
|
|
2082 |
logMessage:something
|
|
|
2083 |
logMessage := something.
|
|
|
2084 |
!
|
|
|
2085 |
|
|
|
2086 |
manager
|
|
|
2087 |
|
|
|
2088 |
^ manager
|
|
|
2089 |
!
|
|
|
2090 |
|
|
|
2091 |
manager:something
|
|
|
2092 |
manager := something.
|
|
|
2093 |
!
|
|
|
2094 |
|
|
|
2095 |
moduleName
|
|
|
2096 |
^ moduleName
|
|
|
2097 |
!
|
|
|
2098 |
|
|
|
2099 |
moduleName:something
|
|
|
2100 |
moduleName := something.
|
|
|
2101 |
!
|
|
|
2102 |
|
|
|
2103 |
newestRevision
|
|
|
2104 |
^ newestRevision
|
|
|
2105 |
!
|
|
|
2106 |
|
|
|
2107 |
newestRevision:something
|
|
|
2108 |
newestRevision := something.
|
|
|
2109 |
!
|
|
|
2110 |
|
|
|
2111 |
packageDir
|
|
|
2112 |
^ packageDir
|
|
|
2113 |
!
|
|
|
2114 |
|
|
|
2115 |
packageDir:something
|
|
|
2116 |
packageDir := something.
|
|
|
2117 |
!
|
|
|
2118 |
|
|
|
2119 |
setLogMessage:something
|
|
|
2120 |
something isNil ifTrue:[
|
|
|
2121 |
logMessage := ''.
|
|
|
2122 |
] ifFalse:[
|
|
|
2123 |
logMessage := something asSingleByteStringIfPossible.
|
|
|
2124 |
logMessage bitsPerCharacter ~~ 8 ifTrue:[
|
|
|
2125 |
^ false.
|
|
|
2126 |
].
|
|
|
2127 |
].
|
|
|
2128 |
^ true
|
|
|
2129 |
!
|
|
|
2130 |
|
|
|
2131 |
sourceFileName
|
|
|
2132 |
^ sourceFileName
|
|
|
2133 |
!
|
|
|
2134 |
|
|
|
2135 |
sourceFileName:something
|
|
|
2136 |
sourceFileName := something.
|
|
|
2137 |
!
|
|
|
2138 |
|
|
|
2139 |
tempDirectory
|
|
|
2140 |
|
|
|
2141 |
tempDirectory isNil ifTrue:[
|
|
|
2142 |
tempDirectory := self manager createTempDirectory:nil forModule:nil.
|
|
|
2143 |
].
|
|
|
2144 |
^ tempDirectory
|
|
|
2145 |
!
|
|
|
2146 |
|
|
|
2147 |
tempDirectory:something
|
|
|
2148 |
tempDirectory := something.
|
|
|
2149 |
!
|
|
|
2150 |
|
|
|
2151 |
workSpaceDefinition
|
|
|
2152 |
^ workSpaceDefinition
|
|
|
2153 |
!
|
|
|
2154 |
|
|
|
2155 |
workSpaceDefinition:something
|
|
|
2156 |
workSpaceDefinition := something.
|
|
|
2157 |
! !
|
|
|
2158 |
|
|
|
2159 |
!PerforceSourceCodeManager::CheckInDefinition methodsFor:'actions'!
|
|
|
2160 |
|
|
|
2161 |
getBinaryRevision
|
|
|
2162 |
|
|
|
2163 |
|locRevision |
|
|
|
2164 |
|
|
|
2165 |
locRevision := definitionClass binaryRevision.
|
|
|
2166 |
^ locRevision
|
|
|
2167 |
!
|
|
|
2168 |
|
|
|
2169 |
getBinaryRevisionNumber
|
|
|
2170 |
|
|
|
2171 |
|locRevision |
|
|
|
2172 |
|
|
|
2173 |
locRevision := self getBinaryRevision.
|
|
|
2174 |
locRevision notNil ifTrue:[
|
|
|
2175 |
locRevision := locRevision asNumber.
|
|
|
2176 |
].
|
|
|
2177 |
^ locRevision
|
|
|
2178 |
!
|
|
|
2179 |
|
|
|
2180 |
getLocalRevision
|
|
|
2181 |
|
|
|
2182 |
|locRevision |
|
|
|
2183 |
|
|
|
2184 |
locRevision := definitionClass revision.
|
|
|
2185 |
^ locRevision
|
|
|
2186 |
!
|
|
|
2187 |
|
|
|
2188 |
getLocalRevisionFromRepository
|
|
|
2189 |
|
|
|
2190 |
|locRevision |
|
|
|
2191 |
|
|
|
2192 |
locRevision := self manager newestRevisionOf:definitionClass.
|
|
|
2193 |
locRevision isNil ifTrue:[
|
|
|
2194 |
force ifTrue:[
|
|
|
2195 |
locRevision := self manager newestRevisionInFile:classFileName directory:packageDir module:moduleName.
|
|
|
2196 |
locRevision isNil ifTrue:[
|
|
|
2197 |
locRevision := '1' "/ initial checkin
|
|
|
2198 |
].
|
|
|
2199 |
] ifFalse:[
|
|
|
2200 |
locRevision := '1' "/ initial checkin
|
|
|
2201 |
]
|
|
|
2202 |
] ifFalse:[
|
|
|
2203 |
locRevision == #deleted ifTrue:[
|
|
|
2204 |
locRevision := '0' "/ to force cvs-adding, which resurrects the file from the Attic
|
|
|
2205 |
].
|
|
|
2206 |
].
|
|
|
2207 |
^ locRevision
|
|
|
2208 |
!
|
|
|
2209 |
|
|
|
2210 |
getLocalRevisionNumber
|
|
|
2211 |
|
|
|
2212 |
|locRevision |
|
|
|
2213 |
|
|
|
2214 |
locRevision := self getLocalRevision.
|
|
|
2215 |
locRevision notNil ifTrue:[
|
|
|
2216 |
locRevision := locRevision asNumber.
|
|
|
2217 |
].
|
|
|
2218 |
^ locRevision
|
|
|
2219 |
!
|
|
|
2220 |
|
|
|
2221 |
getLocalRevisionNumberFromRepository
|
|
|
2222 |
|
|
|
2223 |
|locRevision |
|
|
|
2224 |
|
|
|
2225 |
locRevision := self getLocalRevisionFromRepository.
|
|
|
2226 |
locRevision notNil ifTrue:[
|
|
|
2227 |
locRevision := locRevision asNumber.
|
|
|
2228 |
].
|
|
|
2229 |
^ locRevision
|
|
|
2230 |
!
|
|
|
2231 |
|
|
|
2232 |
getNewestRevision
|
|
|
2233 |
|
|
|
2234 |
newestRevision := self manager newestRevisionOf:definitionClass.
|
|
|
2235 |
^ newestRevision
|
|
|
2236 |
!
|
|
|
2237 |
|
|
|
2238 |
getNewestRevisionNumber
|
|
|
2239 |
|
|
|
2240 |
newestRevision isNil ifTrue:[
|
|
|
2241 |
newestRevision := self getNewestRevision.
|
|
|
2242 |
newestRevision notNil ifTrue:[
|
|
|
2243 |
newestRevision := newestRevision asNumber.
|
|
|
2244 |
].
|
|
|
2245 |
].
|
|
|
2246 |
^ newestRevision
|
|
|
2247 |
! !
|
|
|
2248 |
|
|
|
2249 |
!PerforceSourceCodeManager::CheckInDefinition methodsFor:'queries'!
|
|
|
2250 |
|
|
|
2251 |
className
|
|
|
2252 |
|
|
|
2253 |
^ definitionClass name.
|
|
|
2254 |
!
|
|
|
2255 |
|
|
|
2256 |
workSpaceDefinitionFilename
|
|
|
2257 |
|
|
|
2258 |
workSpaceDefinition isNil ifTrue:[ ^ nil ].
|
|
|
2259 |
^ workSpaceDefinition at:#workSpaceDefinitionFilename ifAbsent:nil.
|
|
|
2260 |
! !
|
|
|
2261 |
|
|
|
2262 |
!PerforceSourceCodeManager class methodsFor:'documentation'!
|
|
|
2263 |
|
|
|
2264 |
version_CVS
|
|
|
2265 |
^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.1 2011-04-19 08:32:36 cg Exp $'
|
|
|
2266 |
! !
|
|
|
2267 |
|
|
|
2268 |
PerforceSourceCodeManager initialize!
|