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