PerforceSourceCodeManagerUtilities.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Tue, 05 Jun 2012 15:49:00 +0100
branchjv
changeset 12254 b1237f76f501
child 12255 f3aabcc20321
permissions -rw-r--r--
Merged with /trunk
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12254
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     1
"{ Package: 'stx:libtool' }"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     2
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     3
SourceCodeManagerUtilities subclass:#PerforceSourceCodeManagerUtilities
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     4
	instanceVariableNames:''
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     5
	classVariableNames:''
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     6
	poolDictionaries:''
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     7
	category:'System-SourceCodeManagement'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     8
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     9
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    10
SimpleDialog subclass:#P4CheckinInfoDialog
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    11
	instanceVariableNames:'descriptionHolder logMessageHolder isStableHolder tagHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    12
		quickCheckInHolder quickCheckInVisibleHolder allowEmptyLogMessage
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    13
		warningMessageHolder logHistory logHistoryHeadLineSelectionHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    14
		submitHolder'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    15
	classVariableNames:''
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    16
	poolDictionaries:''
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    17
	privateIn:PerforceSourceCodeManagerUtilities
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    18
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    19
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    20
SimpleDialog subclass:#SubmitInfoDialog
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    21
	instanceVariableNames:'descriptionHolder logMessageHolder isStableHolder tagHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    22
		quickCheckInHolder quickCheckInVisibleHolder allowEmptyLogMessage
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    23
		warningMessageHolder filesHolder tagItInHolder'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    24
	classVariableNames:'LastSourceLogMessage'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    25
	poolDictionaries:''
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    26
	privateIn:PerforceSourceCodeManagerUtilities
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    27
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    28
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    29
Object subclass:#WorkSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    30
	instanceVariableNames:'client host owner root views perforceSettings temporaryWorkSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    31
		tempDirectory'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    32
	classVariableNames:'PerforceCommandSemaphore'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    33
	poolDictionaries:''
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    34
	privateIn:PerforceSourceCodeManagerUtilities
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    35
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    36
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    37
Object subclass:#View
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    38
	instanceVariableNames:'depot local workspace type'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    39
	classVariableNames:''
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    40
	poolDictionaries:''
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    41
	privateIn:PerforceSourceCodeManagerUtilities::WorkSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    42
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    43
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    44
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    45
!PerforceSourceCodeManagerUtilities class methodsFor:'class access'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    46
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    47
submitInfoDialogClass
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    48
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    49
    ^ SubmitInfoDialog
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    50
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    51
    "Created: / 01-06-2012 / 11:09:15 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    52
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    53
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    54
workSpaceClass
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    55
    ^ WorkSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    56
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    57
    "Created: / 01-06-2012 / 11:13:49 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    58
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    59
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    60
!PerforceSourceCodeManagerUtilities methodsFor:'utilities-cvs'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    61
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    62
checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClass usingManager:managerOrNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    63
    "check a class into the source repository.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    64
     If the argument, aLogInfoOrNil isNil, ask interactively for log-message.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    65
     If doCheckClass is true, the class is checked for send of halts etc."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    66
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    67
    |logMessage checkinInfo mgr pri doSubmit|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    68
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    69
    resources := self classResources.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    70
    doSubmit := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    71
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    72
    aClass isLoaded ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    73
        self information:(resources string:'Cannot checkin unloaded classes (%1)' with:aClass name).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    74
        ^ false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    75
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    76
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    77
    mgr := managerOrNil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    78
    mgr isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    79
        mgr := self sourceCodeManagerFor:aClass.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    80
        mgr isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    81
            ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    82
        ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    83
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    84
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    85
    self ensureCorrectVersionMethodsInClass:aClass usingManager:mgr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    86
    mgr supportsCheckinLogMessages ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    87
        (self 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    88
            getLogMessageForClassCheckinTakingDefaultsFromPreviousLogInfo:aLogInfoOrNil 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    89
            forClass:aClass
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    90
            valuesInto:[:logMessageRet :checkinInfoRet |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    91
                logMessage := logMessageRet.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    92
                checkinInfo := checkinInfoRet.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    93
                checkinInfo notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    94
                    doSubmit := checkinInfo submitHolder value.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    95
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    96
            ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    97
        ) ifFalse:[^ false].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    98
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    99
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   100
    (self classIsNotYetInRepository:aClass withManager:mgr) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   101
        (self createSourceContainerForClass:aClass usingManager:mgr) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   102
"/            self warn:'did not create a container for ''' , aClass name , ''''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   103
            ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   104
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   105
        ^ true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   106
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   107
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   108
    self activityNotification:(resources string:'checking in %1' with:aClass name).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   109
    pri := Processor activePriority.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   110
    Processor activeProcess withPriority:pri-1 to:pri
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   111
    do:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   112
        |revision aborted|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   113
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   114
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   115
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   116
        aborted := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   117
        AbortOperationRequest handle:[:ex |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   118
            aborted := true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   119
            ex return.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   120
        ] do:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   121
            |checkinState cause|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   122
            checkinState := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   123
            cause := ''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   124
            [
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   125
                checkinState := mgr checkinClass:aClass logMessage:logMessage submit:doSubmit
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   126
            ] on:SourceCodeManagerError do:[:ex| 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   127
self halt.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   128
                cause := ex description.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   129
                ex proceed.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   130
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   131
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   132
            checkinState ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   133
                Transcript showCR:'checkin of ''' , aClass name , ''' failed - ', cause.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   134
                self warn:(resources stringWithCRs:'Checkin of "%1" failed\\' with:aClass name allBold),cause.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   135
                ^ false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   136
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   137
            checkinInfo notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   138
                checkinInfo isStable ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   139
                    "set stable tag for class that has been checked in"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   140
                    self tagClass:aClass as:#stable.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   141
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   142
                checkinInfo tagIt ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   143
                    "set an additional tag for class that has been checked in"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   144
                    self tagClass:aClass as:(checkinInfo tag).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   145
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   146
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   147
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   148
        aborted ifTrue:[  |con|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   149
            Transcript showCR:'Checkin of ''' , aClass name , ''' aborted'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   150
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   151
            AbortAllOperationWantedQuery query ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   152
                (Dialog 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   153
                    confirm:(resources stringWithCRs:'Checkin of "%1" aborted.\\Cancel all ?' with:aClass name)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   154
                    default:false)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   155
                ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   156
                    AbortAllOperationRequest raise.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   157
                ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   158
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   159
            ^ false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   160
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   161
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   162
    ^ true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   163
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   164
    "Created: / 21-12-2011 / 18:19:14 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   165
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   166
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   167
!PerforceSourceCodeManagerUtilities methodsFor:'utilities-p4'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   168
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   169
submit
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   170
    self defaultManager submit
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   171
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   172
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   173
!PerforceSourceCodeManagerUtilities methodsFor:'utilities-p4-interaction'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   174
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   175
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswerOrNil withQuickOption:withQuickOption
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   176
    "ask for a log message for checking in a class (plus checkinQuick state info),
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   177
     and other info (mark as stable, for example).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   178
     Return the info-object (actually: the dialog) or nil if aborted."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   179
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   180
    |logMsg infoDialog|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   181
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   182
    infoDialog := self defaultManager checkInInfoDialogClass 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   183
                getCheckinInfoFor:aClassNameOrPackageNameString 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   184
                initialAnswer:(initialAnswerOrNil ? LastSourceLogMessage)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   185
                withQuickOption:withQuickOption.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   186
    infoDialog notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   187
        logMsg := infoDialog logMessage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   188
        logMsg notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   189
            LastSourceLogMessage := logMsg
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   190
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   191
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   192
    ^ infoDialog
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   193
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   194
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   195
     SourceCodeManagerUtilities getCheckinInfoFor:'hello' initialAnswer:'bla'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   196
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   197
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   198
    "Modified: / 06-07-2010 / 11:21:28 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   199
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   200
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   201
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog class methodsFor:'documentation'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   202
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   203
copyright
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   204
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   205
 COPYRIGHT (c) 2005 eXept Software AG
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   206
              All Rights Reserved
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   207
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   208
 This software is furnished under a license and may be used
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   209
 only in accordance with the terms of that license and with the
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   210
 inclusion of the above copyright notice.   This software may not
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   211
 be provided or otherwise made available to, or used by, any
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   212
 other person.  No title to or ownership of the software is
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   213
 hereby transferred.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   214
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   215
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   216
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   217
documentation
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   218
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   219
    checkin-dialog.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   220
    used to be private in SourceCodeManagerUtilites.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   221
    moved to libtool because libbasic3 should not contain code inheriting from GUI classes.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   222
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   223
    [author:]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   224
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   225
    [see also:]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   226
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   227
    [instance variables:]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   228
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   229
    [class variables:]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   230
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   231
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   232
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   233
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog class methodsFor:'interface specs'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   234
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   235
windowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   236
    "This resource specification was automatically generated
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   237
     by the UIPainter of ST/X."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   238
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   239
    "Do not manually edit this!! If it is corrupted,
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   240
     the UIPainter may not be able to read the specification."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   241
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   242
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   243
     UIPainter new openOnClass:PerforceSourceCodeManager::P4CheckinInfoDialog andSelector:#windowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   244
     PerforceSourceCodeManager::P4CheckinInfoDialog new openInterface:#windowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   245
     PerforceSourceCodeManager::P4CheckinInfoDialog open
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   246
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   247
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   248
    <resource: #canvas>
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   249
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   250
    ^ 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   251
     #(FullSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   252
        name: windowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   253
        window: 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   254
       (WindowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   255
          label: 'Enter Log Message'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   256
          name: 'Enter Log Message'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   257
          min: (Point 10 10)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   258
          bounds: (Rectangle 0 0 800 327)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   259
        )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   260
        component: 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   261
       (SpecCollection
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   262
          collection: (
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   263
           (HorizontalPanelViewSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   264
              name: 'HorizontalPanel2'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   265
              layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   266
              horizontalLayout: left
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   267
              verticalLayout: center
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   268
              horizontalSpace: 0
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   269
              verticalSpace: 3
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   270
              component: 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   271
             (SpecCollection
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   272
                collection: (
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   273
                 (LabelSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   274
                    label: 'Enter checkIn log-message for:'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   275
                    name: 'Label1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   276
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   277
                    resizeForLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   278
                    useDefaultExtent: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   279
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   280
                 (LabelSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   281
                    name: 'Label2'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   282
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   283
                    labelChannel: descriptionHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   284
                    useDefaultExtent: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   285
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   286
                 )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   287
               
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   288
              )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   289
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   290
           (TextEditorSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   291
              name: 'TextEditor1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   292
              layout: (LayoutFrame 2 0.0 38 0 -2 1 -125 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   293
              model: logMessageHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   294
              hasHorizontalScrollBar: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   295
              hasVerticalScrollBar: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   296
              hasKeyboardFocusInitially: false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   297
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   298
           (LabelSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   299
              name: 'Label4'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   300
              layout: (LayoutFrame 0 0.0 -119 1 0 1.0 -97 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   301
              translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   302
              labelChannel: warningMessageHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   303
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   304
           (CheckBoxSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   305
              label: 'Quick Checkin (Only Classes in ChangeSet)'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   306
              name: 'CheckInChangedOnlyCheckbox'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   307
              layout: (LayoutFrame 3 0 -95 1 -3 0.5 -73 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   308
              visibilityChannel: quickCheckInVisibleHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   309
              model: quickCheckInHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   310
              translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   311
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   312
           (CheckBoxSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   313
              label: 'Mark as Stable'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   314
              name: 'MarkStableCheckBox'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   315
              layout: (LayoutFrame 3 0 -68 1 -3 1 -46 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   316
              model: isStableHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   317
              translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   318
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   319
           (LabelSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   320
              label: 'Tag:'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   321
              name: 'Label3'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   322
              layout: (LayoutFrame -40 0.5 -67 1 0 0.5 -45 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   323
              translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   324
              adjust: right
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   325
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   326
           (InputFieldSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   327
              name: 'TagEntryField'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   328
              layout: (LayoutFrame 0 0.5 -68 1 -3 1 -46 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   329
              enableChannel: tagItInHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   330
              model: tagHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   331
              acceptOnReturn: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   332
              acceptOnTab: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   333
              acceptOnLostFocus: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   334
              acceptOnPointerLeave: false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   335
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   336
           (HorizontalPanelViewSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   337
              name: 'ButtonPanel1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   338
              layout: (LayoutFrame 0 0.0 -40 1 0 1.0 0 1.0)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   339
              horizontalLayout: fitSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   340
              verticalLayout: center
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   341
              horizontalSpace: 3
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   342
              verticalSpace: 2
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   343
              reverseOrderIfOKAtLeft: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   344
              component: 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   345
             (SpecCollection
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   346
                collection: (
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   347
                 (ActionButtonSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   348
                    label: 'Cancel'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   349
                    name: 'Button2'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   350
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   351
                    model: doCancel
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   352
                    extent: (Point 395 22)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   353
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   354
                 (ActionButtonSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   355
                    label: 'OK'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   356
                    name: 'Button1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   357
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   358
                    model: doAccept
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   359
                    extent: (Point 396 22)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   360
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   361
                 )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   362
               
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   363
              )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   364
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   365
           (CheckBoxSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   366
              label: 'Immediate Submit'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   367
              name: 'CheckBox1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   368
              layout: (LayoutFrame 3 0.5 -95 1 -3 1 -73 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   369
              model: submitHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   370
              translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   371
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   372
           )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   373
         
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   374
        )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   375
      )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   376
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   377
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   378
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog class methodsFor:'opening'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   379
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   380
getCheckinInfoFor:aString initialAnswer:initialAnswer
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   381
    ^ self 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   382
        getCheckinInfoFor:aString 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   383
        initialAnswer:initialAnswer 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   384
        withQuickOption:false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   385
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   386
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   387
      self getCheckinInfoFor:'hello' initialAnswer:'bla'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   388
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   389
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   390
    "Modified (format): / 12-03-2012 / 12:38:48 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   391
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   392
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   393
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   394
    ^ self
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   395
        getCheckinInfoFor:aClassNameOrPackageNameString 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   396
        initialAnswer:initialAnswer 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   397
        withQuickOption:withQuickOption
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   398
        logHistory:#()
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   399
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   400
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   401
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   402
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   403
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   404
    "Modified: / 12-03-2012 / 12:39:00 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   405
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   406
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   407
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption logHistory:logHistoryArg
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   408
    |dialog warnMessage|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   409
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   410
    warnMessage := nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   411
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   412
    [
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   413
        dialog := self new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   414
        dialog 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   415
            description:aClassNameOrPackageNameString; 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   416
            logMessage:initialAnswer;
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   417
            withQuickOption:withQuickOption;
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   418
            logHistory:logHistoryArg.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   419
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   420
        dialog warningMessageHolder value:warnMessage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   421
        dialog open.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   422
        dialog accepted ifFalse:[ ^ nil ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   423
    ] doUntil:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   424
        |stopAsking|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   425
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   426
        stopAsking := dialog allowEmptyLogMessage 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   427
                      or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   428
        stopAsking ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   429
            warnMessage := (self resources string:'Please enter a description of your changes!!') 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   430
                                asText 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   431
                                    colorizeAllWith:Color red.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   432
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   433
        stopAsking
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   434
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   435
    ^ dialog    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   436
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   437
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   438
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   439
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   440
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   441
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   442
    "Created: / 12-03-2012 / 12:36:26 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   443
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   444
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   445
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog methodsFor:'accessing'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   446
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   447
allowEmptyLogMessage
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   448
    ^ allowEmptyLogMessage ? false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   449
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   450
    "Created: / 06-07-2010 / 11:23:18 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   451
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   452
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   453
allowEmptyLogMessage:aBoolean 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   454
    allowEmptyLogMessage := aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   455
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   456
    "Created: / 06-07-2010 / 11:23:31 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   457
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   458
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   459
description
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   460
    ^ self descriptionHolder value
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   461
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   462
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   463
description:aString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   464
    self descriptionHolder value:aString allBold
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   465
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   466
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   467
isStable
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   468
    ^ self isStableHolder value
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   469
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   470
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   471
isStable:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   472
    self isStableHolder value:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   473
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   474
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   475
logHistory:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   476
    logHistory := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   477
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   478
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   479
logMessage
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   480
    ^ self logMessageHolder value
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   481
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   482
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   483
logMessage:aString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   484
    self logMessageHolder value:aString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   485
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   486
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   487
quickCheckIn
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   488
    ^ self quickCheckInHolder value
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   489
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   490
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   491
quickCheckIn:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   492
    self quickCheckInHolder value:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   493
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   494
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   495
tag
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   496
    ^ self tagHolder value withoutSeparators
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   497
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   498
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   499
tag:aStringOrNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   500
    self tagHolder value:aStringOrNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   501
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   502
    "Modified: / 12-09-2006 / 12:03:50 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   503
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   504
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   505
tagIt
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   506
    ^ self tag notEmptyOrNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   507
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   508
    "Created: / 12-09-2006 / 13:06:49 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   509
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   510
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   511
withQuickOption:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   512
    ^ self quickCheckInVisibleHolder value:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   513
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   514
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   515
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog methodsFor:'aspects'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   516
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   517
descriptionHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   518
    descriptionHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   519
        descriptionHolder := ValueHolder new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   520
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   521
    ^ descriptionHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   522
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   523
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   524
isStableHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   525
    isStableHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   526
        isStableHolder := false asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   527
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   528
    ^ isStableHolder.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   529
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   530
    "Modified: / 16-01-2007 / 16:00:26 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   531
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   532
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   533
logHistoryHeadLineSelectionHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   534
    logHistoryHeadLineSelectionHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   535
        logHistoryHeadLineSelectionHolder := nil asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   536
        logHistoryHeadLineSelectionHolder 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   537
            onChangeEvaluate:
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   538
                [
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   539
                    self logMessageHolder value:(logHistory at:logHistoryHeadLineSelectionHolder value)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   540
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   541
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   542
    ^ logHistoryHeadLineSelectionHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   543
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   544
    "Created: / 12-03-2012 / 12:40:36 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   545
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   546
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   547
logHistoryHeadLines
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   548
    ^ (logHistory ? #())
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   549
        collect:[:msg |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   550
            msg withoutLeadingSeparators asCollectionOfLines first , '...'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   551
        ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   552
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   553
    "Created: / 12-03-2012 / 12:39:35 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   554
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   555
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   556
logMessageHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   557
    logMessageHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   558
        logMessageHolder := '' asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   559
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   560
    ^ logMessageHolder.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   561
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   562
    "Modified: / 12-03-2012 / 12:34:13 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   563
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   564
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   565
quickCheckInHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   566
    quickCheckInHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   567
        quickCheckInHolder := true asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   568
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   569
    ^ quickCheckInHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   570
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   571
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   572
quickCheckInVisibleHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   573
    quickCheckInVisibleHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   574
        quickCheckInVisibleHolder := false asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   575
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   576
    ^ quickCheckInVisibleHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   577
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   578
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   579
submitHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   580
    submitHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   581
        submitHolder := false asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   582
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   583
    ^ submitHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   584
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   585
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   586
tagHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   587
    tagHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   588
        tagHolder := '' asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   589
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   590
    ^ tagHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   591
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   592
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   593
warningMessageHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   594
    warningMessageHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   595
        warningMessageHolder := nil asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   596
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   597
    ^ warningMessageHolder.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   598
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   599
    "Created: / 06-07-2010 / 11:30:29 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   600
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   601
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   602
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog class methodsFor:'documentation'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   603
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   604
copyright
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   605
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   606
 COPYRIGHT (c) 2005 eXept Software AG
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   607
              All Rights Reserved
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   608
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   609
 This software is furnished under a license and may be used
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   610
 only in accordance with the terms of that license and with the
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   611
 inclusion of the above copyright notice.   This software may not
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   612
 be provided or otherwise made available to, or used by, any
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   613
 other person.  No title to or ownership of the software is
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   614
 hereby transferred.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   615
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   616
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   617
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   618
documentation
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   619
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   620
    checkin-dialog.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   621
    used to be private in SourceCodeManagerUtilites.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   622
    moved to libtool because libbasic3 should not contain code inheriting from GUI classes.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   623
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   624
    [author:]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   625
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   626
    [see also:]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   627
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   628
    [instance variables:]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   629
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   630
    [class variables:]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   631
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   632
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   633
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   634
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog class methodsFor:'interface specs'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   635
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   636
windowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   637
    "This resource specification was automatically generated
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   638
     by the UIPainter of ST/X."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   639
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   640
    "Do not manually edit this!! If it is corrupted,
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   641
     the UIPainter may not be able to read the specification."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   642
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   643
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   644
     UIPainter new openOnClass:PerforceSourceCodeManager::SubmitInfoDialog andSelector:#windowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   645
     PerforceSourceCodeManager::SubmitInfoDialog new openInterface:#windowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   646
     PerforceSourceCodeManager::SubmitInfoDialog open
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   647
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   648
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   649
    <resource: #canvas>
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   650
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   651
    ^ 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   652
     #(FullSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   653
        name: windowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   654
        window: 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   655
       (WindowSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   656
          label: 'Enter Log Message'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   657
          name: 'Enter Log Message'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   658
          min: (Point 10 10)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   659
          bounds: (Rectangle 0 0 563 561)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   660
        )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   661
        component: 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   662
       (SpecCollection
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   663
          collection: (
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   664
           (HorizontalPanelViewSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   665
              name: 'HorizontalPanel2'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   666
              layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   667
              horizontalLayout: left
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   668
              verticalLayout: center
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   669
              horizontalSpace: 0
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   670
              verticalSpace: 3
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   671
              component: 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   672
             (SpecCollection
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   673
                collection: (
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   674
                 (LabelSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   675
                    label: 'Enter checkIn log-message for:'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   676
                    name: 'Label1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   677
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   678
                    resizeForLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   679
                    useDefaultExtent: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   680
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   681
                 (LabelSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   682
                    name: 'Label2'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   683
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   684
                    labelChannel: descriptionHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   685
                    useDefaultExtent: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   686
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   687
                 )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   688
               
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   689
              )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   690
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   691
           (VerticalPanelViewSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   692
              name: 'VerticalPanel1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   693
              layout: (LayoutFrame 0 0.0 38 0 0 1.0 -80 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   694
              horizontalLayout: fit
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   695
              verticalLayout: topFit
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   696
              horizontalSpace: 3
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   697
              verticalSpace: 3
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   698
              component: 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   699
             (SpecCollection
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   700
                collection: (
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   701
                 (LabelSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   702
                    label: 'Files:'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   703
                    name: 'Label4'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   704
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   705
                    adjust: left
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   706
                    extent: (Point 563 23)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   707
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   708
                 (TextEditorSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   709
                    name: 'TextEditor1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   710
                    enableChannel: false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   711
                    model: filesHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   712
                    hasHorizontalScrollBar: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   713
                    hasVerticalScrollBar: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   714
                    hasKeyboardFocusInitially: false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   715
                    extent: (Point 563 146)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   716
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   717
                 (LabelSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   718
                    label: 'Log Message:'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   719
                    name: 'Label5'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   720
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   721
                    adjust: left
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   722
                    extent: (Point 563 23)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   723
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   724
                 (TextEditorSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   725
                    name: 'TextEditor2'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   726
                    model: logMessageHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   727
                    hasHorizontalScrollBar: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   728
                    hasVerticalScrollBar: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   729
                    hasKeyboardFocusInitially: false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   730
                    extent: (Point 563 242)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   731
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   732
                 )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   733
               
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   734
              )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   735
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   736
           (CheckBoxSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   737
              label: 'Mark as Stable'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   738
              name: 'MarkStableCheckBox'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   739
              layout: (LayoutFrame 3 0 -68 1 -3 1 -46 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   740
              model: isStableHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   741
              translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   742
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   743
           (LabelSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   744
              label: 'Tag:'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   745
              name: 'Label3'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   746
              layout: (LayoutFrame -40 0.5 -67 1 0 0.5 -45 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   747
              translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   748
              adjust: right
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   749
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   750
           (InputFieldSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   751
              name: 'TagEntryField'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   752
              layout: (LayoutFrame 0 0.5 -68 1 -3 1 -46 1)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   753
              enableChannel: tagItInHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   754
              model: tagHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   755
              acceptOnReturn: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   756
              acceptOnTab: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   757
              acceptOnLostFocus: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   758
              acceptOnPointerLeave: false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   759
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   760
           (HorizontalPanelViewSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   761
              name: 'ButtonPanel1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   762
              layout: (LayoutFrame 0 0.0 -40 1 0 1.0 0 1.0)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   763
              horizontalLayout: fitSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   764
              verticalLayout: center
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   765
              horizontalSpace: 3
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   766
              verticalSpace: 2
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   767
              reverseOrderIfOKAtLeft: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   768
              component: 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   769
             (SpecCollection
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   770
                collection: (
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   771
                 (ActionButtonSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   772
                    label: 'Cancel'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   773
                    name: 'Button2'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   774
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   775
                    model: doCancel
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   776
                    extent: (Point 277 22)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   777
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   778
                 (ActionButtonSpec
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   779
                    label: 'OK'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   780
                    name: 'Button1'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   781
                    translateLabel: true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   782
                    model: doAccept
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   783
                    extent: (Point 277 22)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   784
                  )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   785
                 )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   786
               
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   787
              )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   788
            )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   789
           )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   790
         
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   791
        )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   792
      )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   793
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   794
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   795
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog class methodsFor:'opening'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   796
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   797
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withFileList:fileList
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   798
    |dialog warnMessage|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   799
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   800
    warnMessage := nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   801
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   802
    [
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   803
        dialog := self new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   804
        dialog 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   805
            description:aClassNameOrPackageNameString; 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   806
            logMessage:initialAnswer;
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   807
            files:fileList.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   808
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   809
        dialog warningMessageHolder value:warnMessage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   810
        dialog open.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   811
        dialog accepted ifFalse:[ ^ nil ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   812
    ] doUntil:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   813
        |stopAsking|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   814
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   815
        stopAsking := dialog allowEmptyLogMessage 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   816
                      or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   817
        stopAsking ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   818
            warnMessage := (self resources string:'Please enter a description of your changes!!') 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   819
                                asText 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   820
                                    colorizeAllWith:Color red.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   821
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   822
        stopAsking
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   823
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   824
    ^ dialog    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   825
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   826
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   827
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   828
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   829
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   830
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   831
    "Modified: / 06-07-2010 / 11:40:00 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   832
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   833
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   834
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   835
    |dialog warnMessage|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   836
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   837
    warnMessage := nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   838
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   839
    [
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   840
        dialog := self new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   841
        dialog 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   842
            description:aClassNameOrPackageNameString; 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   843
            logMessage:initialAnswer;
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   844
            withQuickOption:withQuickOption.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   845
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   846
        dialog warningMessageHolder value:warnMessage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   847
        dialog open.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   848
        dialog accepted ifFalse:[ ^ nil ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   849
    ] doUntil:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   850
        |stopAsking|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   851
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   852
        stopAsking := dialog allowEmptyLogMessage 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   853
                      or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   854
        stopAsking ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   855
            warnMessage := (self resources string:'Please enter a description of your changes!!') 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   856
                                asText 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   857
                                    colorizeAllWith:Color red.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   858
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   859
        stopAsking
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   860
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   861
    ^ dialog    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   862
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   863
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   864
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   865
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   866
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   867
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   868
    "Modified: / 06-07-2010 / 11:40:00 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   869
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   870
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   871
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog methodsFor:'accessing'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   872
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   873
allowEmptyLogMessage
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   874
    ^ allowEmptyLogMessage ? false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   875
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   876
    "Created: / 06-07-2010 / 11:23:18 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   877
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   878
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   879
allowEmptyLogMessage:aBoolean 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   880
    allowEmptyLogMessage := aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   881
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   882
    "Created: / 06-07-2010 / 11:23:31 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   883
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   884
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   885
description
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   886
    ^ self descriptionHolder value
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   887
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   888
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   889
description:aString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   890
    self descriptionHolder value:aString allBold
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   891
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   892
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   893
files
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   894
    ^ self filesHolder value
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   895
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   896
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   897
files:aString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   898
    self filesHolder value:aString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   899
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   900
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   901
isStable
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   902
    ^ self isStableHolder value
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   903
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   904
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   905
isStable:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   906
    self isStableHolder value:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   907
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   908
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   909
logMessage
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   910
    ^ self logMessageHolder value
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   911
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   912
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   913
logMessage:aString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   914
    self logMessageHolder value:aString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   915
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   916
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   917
quickCheckIn
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   918
    ^ self quickCheckInHolder value
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   919
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   920
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   921
quickCheckIn:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   922
    self quickCheckInHolder value:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   923
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   924
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   925
tag
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   926
    ^ self tagHolder value withoutSeparators
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   927
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   928
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   929
tag:aStringOrNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   930
    self tagHolder value:aStringOrNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   931
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   932
    "Modified: / 12-09-2006 / 12:03:50 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   933
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   934
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   935
tagIt
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   936
    ^ self tag notEmptyOrNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   937
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   938
    "Created: / 12-09-2006 / 13:06:49 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   939
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   940
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   941
withQuickOption:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   942
    ^ self quickCheckInVisibleHolder value:aBoolean
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   943
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   944
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   945
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog methodsFor:'aspects'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   946
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   947
descriptionHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   948
    descriptionHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   949
        descriptionHolder := ValueHolder new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   950
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   951
    ^ descriptionHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   952
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   953
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   954
filesHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   955
    <resource: #uiAspect>
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   956
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   957
    "automatically generated by UIPainter ..."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   958
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   959
    "*** the code below creates a default model when invoked."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   960
    "*** (which may not be the one you wanted)"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   961
    "*** Please change as required and accept it in the browser."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   962
    "*** (and replace this comment by something more useful ;-)"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   963
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   964
    filesHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   965
        filesHolder := '' asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   966
"/ if your app needs to be notified of changes, uncomment one of the lines below:
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   967
"/       filesHolder addDependent:self.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   968
"/       filesHolder onChangeSend:#filesHolderChanged to:self.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   969
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   970
    ^ filesHolder.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   971
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   972
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   973
isStableHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   974
    isStableHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   975
        isStableHolder := false asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   976
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   977
    ^ isStableHolder.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   978
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   979
    "Modified: / 16-01-2007 / 16:00:26 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   980
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   981
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   982
logMessageHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   983
    logMessageHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   984
        logMessageHolder := LastSourceLogMessage asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   985
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   986
    ^ logMessageHolder.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   987
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   988
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   989
quickCheckInHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   990
    quickCheckInHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   991
        quickCheckInHolder := true asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   992
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   993
    ^ quickCheckInHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   994
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   995
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   996
quickCheckInVisibleHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   997
    quickCheckInVisibleHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   998
        quickCheckInVisibleHolder := false asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   999
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1000
    ^ quickCheckInVisibleHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1001
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1002
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1003
tagHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1004
    tagHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1005
        tagHolder := '' asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1006
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1007
    ^ tagHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1008
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1009
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1010
tagItInHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1011
    <resource: #uiAspect>
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1012
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1013
    "automatically generated by UIPainter ..."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1014
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1015
    "*** the code below creates a default model when invoked."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1016
    "*** (which may not be the one you wanted)"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1017
    "*** Please change as required and accept it in the browser."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1018
    "*** (and replace this comment by something more useful ;-)"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1019
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1020
    tagItInHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1021
        tagItInHolder := true asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1022
"/ if your app needs to be notified of changes, uncomment one of the lines below:
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1023
"/       tagItInHolder addDependent:self.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1024
"/       tagItInHolder onChangeSend:#tagItInHolderChanged to:self.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1025
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1026
    ^ tagItInHolder.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1027
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1028
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1029
warningMessageHolder
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1030
    warningMessageHolder isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1031
        warningMessageHolder := nil asValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1032
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1033
    ^ warningMessageHolder.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1034
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1035
    "Created: / 06-07-2010 / 11:30:29 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1036
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1037
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1038
!PerforceSourceCodeManagerUtilities::WorkSpace class methodsFor:'instance creation'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1039
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1040
newWorkSpaceFor:aSettingsString  
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1041
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1042
        get the workspace definition from perforce client command output
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1043
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1044
    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1045
    |workSpace|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1046
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1047
    aSettingsString isEmptyOrNil ifTrue:[ ^nil].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1048
    workSpace := self new initialize.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1049
    ^ workSpace newWorkSpaceFor:aSettingsString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1050
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1051
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1052
newWorkSpaceForSettings:settingsDict
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1053
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1054
        get the workspace definition from perforce client command output"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1055
    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1056
    |workSpace|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1057
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1058
    workSpace := self new initialize.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1059
    ^ workSpace newWorkSpaceForSettings:settingsDict
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1060
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1061
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1062
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'accessing'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1063
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1064
client
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1065
    ^ client
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1066
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1067
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1068
client:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1069
    client := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1070
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1071
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1072
host
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1073
    ^ host
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1074
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1075
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1076
host:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1077
    host := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1078
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1079
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1080
owner
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1081
    ^ owner
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1082
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1083
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1084
owner:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1085
    owner := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1086
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1087
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1088
perforceSettings
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1089
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1090
    perforceSettings isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1091
        perforceSettings := Dictionary new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1092
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1093
    ^ perforceSettings
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1094
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1095
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1096
perforceSettings:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1097
    perforceSettings := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1098
    self owner:(perforceSettings at:#user ifAbsent:nil).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1099
    self client:(perforceSettings at:#client ifAbsent:nil).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1100
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1101
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1102
root
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1103
    ^ root
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1104
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1105
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1106
root:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1107
    root := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1108
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1109
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1110
tempDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1111
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1112
    tempDirectory isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1113
        tempDirectory := PerforceSourceCodeManager createTempDirectory:nil forModule:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1114
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1115
    ^ tempDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1116
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1117
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1118
temporaryWorkSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1119
    ^ temporaryWorkSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1120
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1121
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1122
views
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1123
    views isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1124
        views := OrderedCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1125
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1126
    ^ views
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1127
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1128
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1129
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'actions'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1130
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1131
addCheckIn:checkInDefinition submit:doSubmit
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1132
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1133
    | packagePath fullFilename s perforceCommand outputStream errorStream result tmpFilename binRevision newRevisionString number|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1134
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1135
    " create container for class initial check in"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1136
    checkInDefinition isClassCheckin ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1137
        binRevision := checkInDefinition getBinaryRevisionNumber.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1138
        (binRevision notNil and:[binRevision ~= 0]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1139
            (Dialog confirm:('Someone seems to have removed the source container for ',checkInDefinition definitionObjectString,'\\Force new checkin ?') withCRs) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1140
                checkInDefinition definitionClass setBinaryRevision:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1141
            ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1142
                ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1143
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1144
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1145
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1146
    "initial checkin here"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1147
    self activityNotification:'adding ' , checkInDefinition definitionObjectString , ' to perforce repository...'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1148
    self getTemporaryWorkspaceFor:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1149
    self temporaryWorkSpace isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1150
        self perforceError raiseErrorString:('Error getting temporary workspace when adding ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1151
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1152
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1153
    number := self getChangeListNumber.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1154
    number isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1155
        self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1156
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1157
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1158
    packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1159
    fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1160
    tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1161
    tmpFilename directory recursiveMakeDirectory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1162
    s := tmpFilename writeStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1163
    checkInDefinition isClassCheckin ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1164
        newRevisionString := self initialRevisionStringFor:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1165
        PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses) 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1166
            of:checkInDefinition definitionClass 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1167
            for:newRevisionString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1168
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1169
    checkInDefinition isClassCheckin ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1170
        PerforceSourceCodeManager fileOutSourceCodeOf:checkInDefinition definitionClass on:s.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1171
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1172
        s nextPutAll:checkInDefinition fileContents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1173
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1174
    s close.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1175
    perforceCommand := ('add  -t +ko -c ' , number printString, ' "', tmpFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1176
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1177
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1178
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1179
        inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1180
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1181
        logHeader:('adding ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1182
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1183
        checkInDefinition isClassCheckin ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1184
            Class withoutUpdatingChangesDo:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1185
                checkInDefinition definitionClass class removeSelector:PerforceSourceCodeManager nameOfVersionMethodInClasses    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1186
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1187
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1188
        ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1189
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1190
    result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1191
    doSubmit ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1192
        result := self submitChangeNumber:number printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1193
        checkInDefinition isClassCheckin ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1194
            " checkout in real workspace "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1195
            perforceCommand := ('sync ' , number printString, ' "', fullFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1196
            outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1197
            errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1198
            result := self executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1199
                inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1200
                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1201
                logHeader:('sync in my workspace ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1202
            result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1203
                ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1204
            ].        
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1205
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1206
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1207
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1208
    self activityNotification:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1209
    ^result
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1210
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1211
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1212
askForMergedSource:mergedSource 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1213
    localSource:mySource 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1214
    changesDict:changesDict 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1215
    haveRevision:haveRevision 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1216
    changesAsLogged:changesAsLogged 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1217
    pathName:pathName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1218
    definitionClass:definitionClass
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1219
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1220
    |msg answer checkInRepaired emphasizedText emSep diffTextComment didAccept editor repairedText resultSource|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1221
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1222
    (changesDict notNil and:[(changesDict at:#conflicting) > 0]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1223
        "ooops must resolve conflicts"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1224
        msg := self messageForConflictsInClass:definitionClass revision:haveRevision.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1225
        answer := self checkinTroubleDialog:'Version conflict'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1226
             message:msg
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1227
             log:changesAsLogged
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1228
             abortable:false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1229
             option:'show conflicts'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1230
             option2:'resolve conflicts'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1231
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1232
        answer == #option ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1233
            "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1234
            "/ show conflicts in a 3-way DiffTextView ...
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1235
            "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1236
            Diff3TextView
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1237
                openOnMergedText:mergedSource
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1238
                label:'your version (checkin attempt)'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1239
                label:'original (base version)'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1240
                label:'newest repository version'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1241
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1242
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1243
        checkInRepaired := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1244
        answer == #option2 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1245
            "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1246
            "/ allow checkin of repair version
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1247
            "/ this is error prone ...
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1248
            "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1249
            "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1250
            "/ show merged version in an editor ...
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1251
            "/ ... accept will check it in.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1252
            "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1253
            emphasizedText := mergedSource asStringCollection.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1254
            emSep := (Array with:(#color->Color black) with:(#backgroundColor->Color green)).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1255
            emphasizedText := Diff3TextView
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1256
                        emphasizeMergedDiff3TextFromPerforce:emphasizedText
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1257
                        origEmphasis:(Array with:(#color->Color black) with:(#backgroundColor->Color yellow))
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1258
                        otherEmphasis:(Array with:(#color->Color white) with:(#backgroundColor->Color red))
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1259
                        yourEmphasis:(Array with:(#color->Color white) with:(#backgroundColor->Color red))
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1260
                        separatorEmphasis:emSep.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1261
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1262
            diffTextComment := self diffTextComment.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1263
            diffTextComment := (Text string:diffTextComment emphasis:emSep) asStringCollection.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1264
            emphasizedText := diffTextComment , emphasizedText.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1265
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1266
            didAccept := false. checkInRepaired := true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1267
            [didAccept not and:[checkInRepaired]] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1268
                editor := RCSConflictEditTextView
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1269
                            setupWith:emphasizedText
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1270
                            title:'Resolve conflicts in ' , pathName asFilename baseName , ', then accept & close to checkin'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1271
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1272
                editor acceptAction:[:dummy |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1273
                    repairedText := editor list.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1274
                    didAccept := true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1275
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1276
                didAccept := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1277
                editor topView openModal.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1278
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1279
                didAccept ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1280
                    (Dialog confirm:'You did not accept the new text. Edit again ?')
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1281
                    ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1282
                        checkInRepaired := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1283
                    ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1284
                ] ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1285
                    "/ check if all green-stuff (separators) have been removed
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1286
                    (repairedText findFirst:[:line | line notNil and:[line notEmpty and:[(line emphasisAt:1) = emSep]]]) ~~ 0 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1287
                        self warn:'You have to look at ALL conflicts, and remove ALL green lines as a confirmation !!'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1288
                        didAccept := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1289
                    ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1290
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1291
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1292
            resultSource := repairedText asString string.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1293
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1294
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1295
        checkInRepaired ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1296
            Transcript showCR:'checking in ' , pathName asFilename baseName , ' (manually repaired version) ...'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1297
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1298
            'PerforceSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1299
            Transcript showCR:'checkin of ' , pathName asFilename baseName , ' aborted (conflicting changes; repository unchanged)'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1300
            ^ nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1301
        ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1302
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1303
        mySource = mergedSource ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1304
            msg := self messageForNoChangesInClass:definitionClass.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1305
            self checkinTroubleDialog:'Merging versions'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1306
                           message:msg
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1307
                           log:changesAsLogged
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1308
                           abortable:false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1309
                           option:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1310
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1311
            msg := self messageForChangesInClass:definitionClass revision:haveRevision.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1312
            answer := self checkinTroubleDialog:'Merging versions'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1313
                           message:msg
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1314
                           log:changesAsLogged
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1315
                           abortable:true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1316
                           option:'Stop - see first'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1317
            answer ~~ true ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1318
                answer == #option ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1319
                    DiffCodeView
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1320
                        openOn:mySource
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1321
                        label:'current version'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1322
                        and:mergedSource
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1323
                        label:'merged version'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1324
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1325
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1326
                Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1327
                ^ nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1328
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1329
            resultSource := mergedSource.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1330
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1331
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1332
    ^ resultSource
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1333
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1334
    "Modified (format): / 01-06-2012 / 10:45:09 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1335
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1336
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1337
changeChangeDescriptionTo:logLines changeNumber:changeNumber
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1338
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1339
    |perforceCommand outputStream errorStream changeListFile result changeFileContents changeListFileStream firstIndex oldLogFileLines writeNextLine newLogFileLines currentTokenLineParts currentToken|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1340
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1341
    perforceCommand := 'change -o ', (changeNumber ? '').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1342
    outputStream := ReadWriteStream on:''.                                       
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1343
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1344
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1345
                        inDirectory:self tempDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1346
                        inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1347
                        outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1348
                        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1349
                        logHeader:('get change desription for change ', changeNumber printString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1350
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1351
        ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1352
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1353
    changeFileContents := outputStream contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1354
    changeFileContents isEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1355
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1356
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1357
    changeListFile := self tempDirectory construct:'change'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1358
    changeListFileStream := changeListFile writeStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1359
    changeFileContents := changeFileContents asStringCollection.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1360
    firstIndex := changeFileContents indexOfLineStartingWith:'Description:'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1361
    firstIndex == 0 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1362
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1363
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1364
    oldLogFileLines := StringCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1365
    changeFileContents from:firstIndex do:[:aLine|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1366
        ((aLine size > 1) and:[aLine first ~= $# and:[aLine first isSeparator not]]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1367
            currentTokenLineParts := aLine asCollectionOfSubstringsSeparatedBy:$:.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1368
            currentTokenLineParts size > 1 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1369
                currentToken := currentTokenLineParts first.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1370
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1371
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1372
        ((aLine size > 1) and:[aLine first isSeparator and:[currentToken = 'Description']]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1373
            oldLogFileLines add:(aLine copyFrom:2).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1374
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1375
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1376
    newLogFileLines := StringCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1377
    changeNumber isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1378
        newLogFileLines := logLines.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1379
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1380
        (oldLogFileLines asString includesString:logLines asString) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1381
            newLogFileLines := oldLogFileLines.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1382
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1383
            newLogFileLines := oldLogFileLines.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1384
            newLogFileLines addAll:logLines
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1385
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1386
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1387
    writeNextLine := true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1388
    changeFileContents do:[:aLine|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1389
        writeNextLine ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1390
            (aLine notEmpty and:[aLine first isSeparator not]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1391
                writeNextLine := true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1392
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1393
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1394
        writeNextLine ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1395
            (aLine startsWith:'Description:') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1396
                changeListFileStream nextPutLine:aLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1397
                newLogFileLines do:[:logLine|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1398
                    changeListFileStream nextPut:Character tab.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1399
                    changeListFileStream nextPutLine:logLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1400
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1401
                writeNextLine := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1402
            ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1403
                changeListFileStream nextPutLine:aLine
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1404
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1405
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1406
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1407
    changeListFileStream close.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1408
    perforceCommand := ('change -i < "', changeListFile pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1409
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1410
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1411
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1412
                        inDirectory:self tempDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1413
                        inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1414
                        outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1415
                        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1416
                        logHeader:('write change desription for change ', changeNumber printString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1417
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1418
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1419
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1420
    ^ true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1421
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1422
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1423
checkForExistingContainer:checkInDefinition
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1424
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1425
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1426
    |perforceCommand outputStream errorStream result packagePath fullFilename depotPath|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1427
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1428
    packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1429
    fullFilename := packagePath construct:checkInDefinition packageDir.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1430
    depotPath := self getDepotPathForLocalPath:fullFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1431
    perforceCommand := ('dirs "' ,depotPath , '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1432
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1433
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1434
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1435
        inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1436
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1437
        logHeader:('dirs in checkForExistingContainer for ', depotPath, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1438
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1439
        ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1440
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1441
    errorStream contents notEmpty ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1442
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1443
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1444
    ^ true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1445
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1446
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1447
checkIn:checkInDefinition submit:doSubmit
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1448
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1449
    | packagePath fullFilename s perforceCommand outputStream errorStream result tmpFilename fileNameAndRev tmpFilenameAndRev 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1450
      haveChange nextVersionMethod diffOutput number baseRevision cls newestInRepository newVersionString openChangeNumber|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1451
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1452
    self activityNotification:'checkin ' , checkInDefinition definitionObjectString , ' to perforce repository...'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1453
    [                                 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1454
        cls := checkInDefinition definitionClass.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1455
        self getTemporaryWorkspaceFor:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1456
        self temporaryWorkSpace isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1457
            self perforceError raiseErrorString:('Error getting temporary workspace when check in ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1458
            ^false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1459
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1460
        baseRevision := checkInDefinition getLocalRevisionNumber.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1461
        newestInRepository := checkInDefinition getReposRevisionNumberBeforeCheckin.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1462
        baseRevision isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1463
            self perforceError raiseErrorString:('No local revision for ', checkInDefinition definitionObjectString,' - should not happen here.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1464
            ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1465
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1466
        packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1467
        fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1468
        tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1469
        tmpFilename directory recursiveMakeDirectory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1470
        checkInDefinition isClassCheckin ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1471
            baseRevision > newestInRepository ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1472
                openChangeNumber := self getOpenChangeFor:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1473
                openChangeNumber isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1474
                    (Dialog confirm:('The version-info of ',checkInDefinition definitionObjectString allBold,' is wrong \(The class version (',baseRevision printString allBold,') is newer than the newest version in the repository (',newestInRepository printString allBold,').\\Patch the version and checkin ?') withCRs)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1475
                    ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1476
                        newVersionString := self updatedRevisionStringOf:cls 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1477
                                                    forRevision:newestInRepository printString with:(cls revisionStringOfManager:self).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1478
                        PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses) 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1479
                            of:cls 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1480
                            for:newVersionString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1481
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1482
                        cls updateVersionMethodFor:newVersionString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1483
                    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1484
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1485
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1486
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1487
        fileNameAndRev := checkInDefinition fileName, '#', baseRevision printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1488
        tmpFilenameAndRev := tmpFilename directory construct:fileNameAndRev.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1489
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1490
        openChangeNumber notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1491
            s := tmpFilename writeStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1492
            checkInDefinition isClassCheckin ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1493
                PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1494
            ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1495
                self halt.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1496
                s nextPutAll:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1497
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1498
            s close.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1499
            self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:openChangeNumber printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1500
            doSubmit ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1501
                self submitChangeNumber:openChangeNumber printString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1502
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1503
            ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1504
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1505
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1506
        perforceCommand := ('sync "' , tmpFilenameAndRev pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1507
        outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1508
        errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1509
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1510
            inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1511
            errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1512
            logHeader:('sync ', checkInDefinition definitionObjectString, ' to revision ', baseRevision printString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1513
        result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1514
            ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1515
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1516
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1517
        number := self getChangeListNumber.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1518
        number isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1519
            self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1520
            ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1521
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1522
        perforceCommand := ('edit -c ' ,number printString, ' "', tmpFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1523
        outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1524
        errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1525
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1526
            inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1527
            errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1528
            logHeader:('edit ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1529
        result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1530
            ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1531
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1532
        s := tmpFilename writeStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1533
        checkInDefinition isClassCheckin ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1534
            PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1535
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1536
            self halt.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1537
            s nextPutAll:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1538
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1539
        s close.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1540
        perforceCommand := ('diff -db -dw -dl "' , tmpFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1541
        outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1542
        errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1543
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1544
            inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1545
            errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1546
            logHeader:('diff ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1547
        diffOutput := outputStream contents asStringCollection.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1548
        haveChange := diffOutput isEmptyOrNil or:[diffOutput notEmptyOrNil and:[diffOutput size > 1]].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1549
        haveChange ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1550
            self information:checkInDefinition definitionObjectString, ' not changed for revision ', baseRevision printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1551
            perforceCommand := ('revert "' , tmpFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1552
            outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1553
            errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1554
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1555
                inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1556
                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1557
                logHeader:('revert ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1558
            ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1559
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1560
        checkInDefinition isClassCheckin ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1561
            nextVersionMethod := self nextRevisionStringFor:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1562
            nextVersionMethod isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1563
                self perforceError raiseErrorString:('Cant get next version method string for ', checkInDefinition definitionObjectString, ' revision ', baseRevision printString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1564
                ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1565
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1566
            PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses) 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1567
                    of:cls 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1568
                    for:nextVersionMethod.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1569
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1570
        result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1571
        doSubmit ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1572
            result := self submitChangeNumber:number printString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1573
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1574
    ] ensure:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1575
        self activityNotification:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1576
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1577
    ^result
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1578
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1579
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1580
createChange
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1581
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1582
    ^self changeChangeDescriptionTo:('' asStringCollection) changeNumber:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1583
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1584
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1585
createWorkSpaceClientSpecFor:checkInDefinition
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1586
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1587
    |ws myView|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1588
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1589
    ws := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1590
    ws nextPutAll:'Client: '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1591
    ws nextPutAll:(self client).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1592
    ws cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1593
    ws nextPutAll:'Owner: '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1594
    ws nextPutAll:(self owner).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1595
    ws cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1596
    ws nextPutAll:'Host: '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1597
    ws nextPutAll:(self host).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1598
    ws cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1599
    ws nextPutAll:'Description: '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1600
    ws nextPutAll:'Used temporary for Smalltalk/X'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1601
    ws cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1602
    ws nextPutAll:'Root: '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1603
    ws nextPutAll:(self root asFilename pathName).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1604
    ws cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1605
    ws nextPutAll:'Options: '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1606
    ws nextPutAll:'allwrite noclobber nocompress unlocked nomodtime normdir'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1607
    ws cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1608
    ws nextPutAll:'SubmitOptions: '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1609
    ws nextPutAll:'submitunchanged'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1610
    ws cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1611
    ws nextPutAll:'LineEnd: '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1612
    ws nextPutAll:'local'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1613
    ws cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1614
    ws nextPutAll:'View: '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1615
    myView := checkInDefinition workSpace getViewForPackage:checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1616
    ws nextPutAll:myView depot.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1617
    ws space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1618
    ws nextPutAll:'//', self client, '/...'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1619
    ws cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1620
    ws close.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1621
    ^ws contents
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1622
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1623
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1624
delete:checkInDefinition submit:doSubmit
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1625
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1626
    | packagePath fullFilename perforceCommand outputStream errorStream result tmpFilename number newestInRepository|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1627
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1628
    self activityNotification:'delete ' , checkInDefinition definitionObjectString , ' from perforce repository...'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1629
    [
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1630
        newestInRepository := checkInDefinition getReposRevisionNumberBeforeCheckin.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1631
        newestInRepository isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1632
            self information:(checkInDefinition definitionObjectString, ' not exists in repository.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1633
            ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1634
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1635
        self getTemporaryWorkspaceFor:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1636
        self temporaryWorkSpace isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1637
            self perforceError raiseErrorString:('Error getting temporary workspace when check in ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1638
            ^false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1639
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1640
        packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1641
        fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1642
        tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1643
        tmpFilename directory recursiveMakeDirectory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1644
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1645
        number := self getChangeListNumber.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1646
        number isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1647
            self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1648
            ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1649
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1650
        perforceCommand := ('delete -c ' ,number printString, ' "', tmpFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1651
        outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1652
        errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1653
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1654
            inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1655
            errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1656
            logHeader:('Error delete ', checkInDefinition definitionObjectString, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1657
        result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1658
            ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1659
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1660
        result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1661
        doSubmit ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1662
            result := self submitChangeNumber:number printString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1663
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1664
    ] ensure:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1665
        self activityNotification:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1666
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1667
    ^result
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1668
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1669
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1670
deleteWorkSpaceFromServer
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1671
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1672
    |perforceCommand outputStream errorStream result|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1673
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1674
    perforceCommand := ('client -df ', client).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1675
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1676
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1677
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1678
        inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1679
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1680
        logHeader:('delete client ', client).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1681
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1682
        ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1683
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1684
    ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1685
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1686
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1687
getChangeDespriptionInfoFor:changeNumber
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1688
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1689
    |valuePairs startLineIndex keyEndIndex changeContents cmd outputStream errorStream result keyValues beginLine endLine keyName keyValue|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1690
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1691
    valuePairs := OrderedCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1692
    cmd := 'change -o ', (changeNumber ? '').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1693
    outputStream := ReadWriteStream on:''.                                       
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1694
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1695
    result := self temporaryWorkSpace executePerforceCommand:cmd
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1696
                        inDirectory:self tempDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1697
                        inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1698
                        outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1699
                        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1700
                        logHeader:('getting change description ', (changeNumber ? ''), '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1701
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1702
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1703
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1704
    changeContents := outputStream contents asStringCollection.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1705
    changeContents doWithIndex:[:aLine :index|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1706
        startLineIndex isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1707
            (aLine isEmpty or:[(aLine startsWith:$#) or:[aLine first isSeparator]]) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1708
                keyEndIndex := aLine indexOf:$:.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1709
                keyEndIndex ~= 0 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1710
                    startLineIndex := index.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1711
                    valuePairs add:(Array with:index with:nil with:(aLine copyTo:keyEndIndex - 1)).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1712
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1713
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1714
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1715
            (aLine isEmpty or:[aLine startsWith:$#]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1716
                valuePairs last at:2 put:index.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1717
                startLineIndex := nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1718
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1719
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1720
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1721
    keyValues := Dictionary new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1722
    valuePairs do:[:each|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1723
        beginLine := each first.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1724
        endLine := each second.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1725
        keyName := each last.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1726
        (beginLine == (endLine - 1)) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1727
            keyValue := (changeContents at:beginLine) copyFrom:(keyName size + 2).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1728
            keyValue := (keyValue withoutLeadingSeparators withoutTrailingSeparators) asStringCollection.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1729
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1730
            keyValue := changeContents copyFrom:(beginLine + 1) to:(endLine - 1).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1731
            keyValue := keyValue collect:[:each | each withoutLeadingSeparators withoutTrailingSeparators].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1732
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1733
        keyValues at:keyName put:keyValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1734
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1735
    ^ keyValues.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1736
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1737
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1738
getChangeListNumber
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1739
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1740
    |numbers|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1741
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1742
    numbers := self getCurrentChangeListNumbers.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1743
    numbers notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1744
        ^numbers first.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1745
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1746
    self createChange ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1747
        numbers := self getCurrentChangeListNumbers.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1748
        numbers notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1749
            ^numbers first.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1750
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1751
        
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1752
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1753
    ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1754
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1755
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1756
getCurrentChangeListNumbers
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1757
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1758
    |perforceCommand outputStream errorStream result pendingChangesOutput words numbers number|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1759
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1760
    perforceCommand := 'changes -s pending -u ', owner.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1761
    outputStream := ReadWriteStream on:''.                                       
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1762
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1763
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1764
                        inDirectory:self tempDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1765
                        inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1766
                        outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1767
                        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1768
                        doLog:false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1769
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1770
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1771
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1772
    numbers := OrderedCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1773
    pendingChangesOutput := outputStream contents asStringCollection.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1774
    pendingChangesOutput do:[:eachLine|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1775
        words := eachLine asCollectionOfWords.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1776
        words size > 1 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1777
            number := Number readFrom:(ReadStream on:(words at:2)) onError:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1778
            numbers add:number.                              
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1779
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1780
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1781
    ^numbers
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1782
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1783
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1784
getFileStatForPathname:aPathname
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1785
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1786
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1787
    |perforceCommand outputStream errorStream result fileStatDict endOfKeywordIndex keyWord keyValue|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1788
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1789
    perforceCommand := ('fstat  "' , aPathname, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1790
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1791
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1792
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1793
        inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1794
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1795
        logHeader:('getting file status from ', aPathname, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1796
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1797
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1798
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1799
    fileStatDict := Dictionary new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1800
    outputStream contents asStringCollection do:[:aLine|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1801
        endOfKeywordIndex := aLine indexOfSeparatorStartingAt:5.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1802
        keyWord := aLine copyFrom:5 to:(endOfKeywordIndex - 1).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1803
        keyValue := aLine copyFrom:endOfKeywordIndex + 1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1804
        fileStatDict at:keyWord put:keyValue.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1805
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1806
    ^ fileStatDict
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1807
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1808
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1809
     | workSpace tempWorkSpace dict|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1810
    workSpace := PerforceSourceCodeManager getWorkSpaceForPackage:'applistx'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1811
    tempWorkSpace := workSpace temporaryWorkSpace.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1812
    dict := tempWorkSpace getFileStatForPathname:'C:\Dokumente und Einstellungen\gds2180\Lokale Einstellungen\Temp\stx_tmp\st6120368\applistx\util\libDataType\ActionLQualifier.st'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1813
    dict includesKey:'unresolved'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1814
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1815
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1816
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1817
getOpenChangeFor:checkInDefinition
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1818
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1819
    |numbers changeDescr files versionInfo|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1820
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1821
    numbers := self getCurrentChangeListNumbers.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1822
    numbers notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1823
        numbers do:[:changeNumber|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1824
            changeDescr := self getChangeDespriptionInfoFor:changeNumber printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1825
            files := changeDescr at:#Files ifAbsent:[nil].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1826
            files notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1827
                versionInfo := PerforceSourceCodeManager versionInfoClass fromRCSString:checkInDefinition getLocalRevisionString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1828
                files do:[:aFileAndAction|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1829
                    (aFileAndAction startsWith:versionInfo repositoryPathName) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1830
                        ^changeNumber
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1831
                    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1832
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1833
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1834
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1835
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1836
    ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1837
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1838
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1839
getTemporaryWorkspaceFor:checkInDefinition
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1840
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1841
        create an temporary workspace for handle checkin
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1842
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1843
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1844
    |workSpaceName workSpaceDefinitionFilename ws perforceCommand result readStream  directory 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1845
     settingsTemporary myView outputStream errorStream lineStream clientSpec index words|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1846
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1847
    directory := self tempDirectory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1848
    workSpaceName := self temporaryClientName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1849
    perforceCommand := 'clients -u ' , (self perforceSettings at:#user).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1850
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1851
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1852
    result := self executePerforceCommand:perforceCommand
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1853
                        inDirectory:directory pathName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1854
                        inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1855
                        outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1856
                        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1857
                        doLog:false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1858
                        logHeader:('check for existing workspace client.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1859
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1860
        temporaryWorkSpace := nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1861
    ]. 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1862
    index := outputStream contents asStringCollection findFirst:[:aLine|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1863
        words := aLine asCollectionOfWords.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1864
        words size > 1 and:[words second = workSpaceName]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1865
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1866
    index = 0 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1867
        temporaryWorkSpace := nil.   
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1868
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1869
    temporaryWorkSpace isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1870
        directory exists ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1871
            self perforceError raiseErrorString:('Perforce temporary workspace directory ', directory pathName, ' not exists.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1872
            ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1873
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1874
        settingsTemporary := self perforceSettings copy.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1875
        settingsTemporary at:#client put:workSpaceName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1876
        temporaryWorkSpace := self class newWorkSpaceForSettings:settingsTemporary.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1877
        temporaryWorkSpace root:directory asFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1878
        temporaryWorkSpace host:self host.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1879
        myView := self getViewForPackage:checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1880
        lineStream := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1881
        lineStream nextPutAll:myView depot.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1882
        lineStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1883
        lineStream nextPutAll:'//', workSpaceName, '/...'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1884
        temporaryWorkSpace views add:(View newFromLine:lineStream contents workspace:temporaryWorkSpace).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1885
        workSpaceDefinitionFilename := directory asFilename construct:workSpaceName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1886
        clientSpec := temporaryWorkSpace createWorkSpaceClientSpecFor:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1887
        ws := workSpaceDefinitionFilename writeStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1888
        ws nextPutAll:clientSpec.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1889
        ws close.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1890
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1891
        readStream := ReadStream on:clientSpec.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1892
        perforceCommand := 'client -i < "', workSpaceDefinitionFilename pathName, '"'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1893
        outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1894
        errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1895
        result := temporaryWorkSpace executePerforceCommand:perforceCommand
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1896
                            inDirectory:directory pathName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1897
                            inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1898
                            outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1899
                            errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1900
                            doLog:false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1901
                            logHeader:('writing temporary workspace definition.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1902
        result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1903
            temporaryWorkSpace := nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1904
        ]. 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1905
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1906
    ^temporaryWorkSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1907
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1908
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1909
mergeOrResolveConflictsForChangeNumber:aNumber
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1910
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1911
    | tmpFilename perforceCommand outputStream errorStream result s 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1912
      changesAsLogged inStream line changesDict chunksPart words mergedSource mySource 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1913
      localRevision resultSource definitionClass descriptionInfo resolveFiles depotPath localPath checkInDefinition fileStatDict|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1914
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1915
    self temporaryWorkSpace isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1916
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1917
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1918
    descriptionInfo := (self getChangeDespriptionInfoFor:aNumber printString).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1919
    descriptionInfo isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1920
        ^false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1921
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1922
    resolveFiles := descriptionInfo at:#Files ifAbsent:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1923
    resolveFiles isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1924
        ^false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1925
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1926
    resolveFiles do:[:aFileLine|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1927
        depotPath := (aFileLine copyTo:((aFileLine lastIndexOf:$#) - 1 )) withoutTrailingSeparators.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1928
        localPath := self temporaryWorkSpace getLocalPathForDepotPath:depotPath.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1929
        fileStatDict := self temporaryWorkSpace getFileStatForPathname:localPath.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1930
        (fileStatDict includesKey:'unresolved') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1931
            definitionClass := Smalltalk at:(localPath asFilename withoutSuffix baseName asSymbol) ifAbsent:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1932
            checkInDefinition := PerforceSourceCodeManager getCheckInDefinitionForClass:definitionClass.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1933
            localRevision := checkInDefinition getLocalRevisionNumber.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1934
            tmpFilename := localPath asFilename.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1935
            perforceCommand := ('resolve -af  "' , tmpFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1936
            outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1937
            errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1938
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1939
                inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1940
                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1941
                logHeader:('resolving ', tmpFilename pathName, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1942
            result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1943
                ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1944
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1945
            "check for conflicts"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1946
            changesAsLogged := StringCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1947
            inStream := ReadStream on:(outputStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1948
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1949
            [inStream atEnd not] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1950
                line:= inStream nextLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1951
                line notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1952
                    (line startsWith:'Diff chunks:') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1953
                        changesAsLogged add:line.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1954
                        changesDict := Dictionary new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1955
                        chunksPart := line copyFrom:('Diff chunks:' size + 1).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1956
                        (chunksPart asCollectionOfSubstringsSeparatedBy:$+) do:[:eachElement|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1957
                            words := eachElement asCollectionOfWords.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1958
                            changesDict at:words second asSymbol put:words first asNumber.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1959
                        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1960
                    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1961
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1962
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1963
            s := WriteStream on:String new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1964
            PerforceSourceCodeManager fileOutSourceCodeOf:definitionClass on:s.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1965
            mergedSource := tmpFilename readStream contents asString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1966
            mySource := s contents asString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1967
            resultSource := self askForMergedSource:mergedSource 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1968
                    localSource:mySource 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1969
                    changesDict:changesDict 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1970
                    haveRevision:(fileStatDict at:'haveRev' ifAbsent:nil) 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1971
                    changesAsLogged:changesAsLogged 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1972
                    pathName:tmpFilename pathName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1973
                    definitionClass:definitionClass.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1974
            resultSource isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1975
                ^false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1976
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1977
            "now we have a merge - lets get latest revision and write on it "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1978
            perforceCommand := ('revert "' , tmpFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1979
            outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1980
            errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1981
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1982
                inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1983
                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1984
                logHeader:('revert after resolving ', tmpFilename pathName, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1985
            result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1986
                ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1987
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1988
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1989
            tmpFilename remove.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1990
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1991
            perforceCommand := ('sync -f "' , tmpFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1992
            outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1993
            errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1994
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1995
                inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1996
                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1997
                logHeader:('sync after resolving ', tmpFilename pathName, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1998
            result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  1999
                ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2000
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2001
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2002
            perforceCommand := ('edit -c ', aNumber printString, ' "' , tmpFilename pathName, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2003
            outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2004
            errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2005
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2006
                inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2007
                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2008
                logHeader:('edit after resolving ', tmpFilename pathName, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2009
            result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2010
                ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2011
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2012
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2013
            "write my result"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2014
            resultSource notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2015
                s := tmpFilename writeStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2016
                s nextPutAll:resultSource.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2017
                s close.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2018
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2019
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2020
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2021
    ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2022
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2023
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2024
releaseWorkSpace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2025
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2026
    temporaryWorkSpace notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2027
        temporaryWorkSpace deleteWorkSpaceFromServer.   
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2028
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2029
    tempDirectory notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2030
        tempDirectory recursiveRemove.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2031
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2032
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2033
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2034
revisionLogOf:clsOrNil 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2035
fromRevision:firstRev 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2036
toRevision:lastRef 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2037
numberOfRevisions:numRevisions 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2038
fileName:classFileName 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2039
directory:packageDir 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2040
module:aPackage
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2041
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2042
    |atEnd line inHeaderInfo info record revisionRecords headerOnly msg revArg infoAndLogString elements 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2043
     foundView outputStream errorStream inStream packagePath fullFilename depotPath perforceCommand result labelLineElements tags label revision|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2044
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2045
    [
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2046
        revArg := ''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2047
        headerOnly := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2048
        (firstRev notNil or:[lastRef notNil]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2049
            (firstRev == 0 and:[lastRef == 0]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2050
                headerOnly := true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2051
            ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2052
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2053
        foundView := self getViewForPackage:aPackage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2054
        headerOnly ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2055
            msg := 'fetching revision info '
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2056
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2057
            msg := 'reading revision log '
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2058
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2059
        clsOrNil isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2060
            foundView notNil ifTrue:[            
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2061
                msg := msg , 'in ', foundView local.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2062
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2063
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2064
            msg := msg , 'of ', clsOrNil name.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2065
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2066
        self activityNotification:msg,'...'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2067
        packagePath := Smalltalk packageDirectoryForPackageId:aPackage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2068
        fullFilename := (packagePath construct:packageDir) construct:classFileName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2069
        depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2070
        perforceCommand := ('filelog "' , depotPath, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2071
        outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2072
        errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2073
        result := self executePerforceCommand:perforceCommand inDirectory:self root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2074
            inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2075
            errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2076
            logHeader:('getting filelog ', depotPath, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2077
        result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2078
            ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2079
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2080
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2081
        "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2082
        "/ read the commands pipe output and extract the container info
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2083
        "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2084
        info := IdentityDictionary new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2085
        inHeaderInfo := true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2086
        revisionRecords := OrderedCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2087
        info at:#revisions put:revisionRecords.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2088
        inStream := ReadStream on:(outputStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2089
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2090
            line:= inStream nextLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2091
            line notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2092
                |gotIt|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2093
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2094
                gotIt := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2095
                infoAndLogString := line asCollectionOfSubstringsSeparatedBy:$'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2096
                elements := infoAndLogString size.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2097
                elements > 1 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2098
                    record := self readRevisionLogEntryFromString:line.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2099
                    ((record at:#state ifAbsent:'') = 'delete') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2100
                        info at:#newestRevision put:#deleted.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2101
                    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2102
                        info at:#newestRevision put:(record at:#revision).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2103
                    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2104
                    info at:#numberOfRevisions put:((record at:#revision) asNumber).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2105
                    revisionRecords add:record.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2106
                    inHeaderInfo := false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2107
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2108
            ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2109
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2110
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2111
        info isEmpty ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2112
            ('PerforceSourceCodeManager [warning]: no log for ', depotPath) errorPrintCR.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2113
            ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2114
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2115
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2116
        "/ strip selected revisions from the total-revisions entry
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2117
        headerOnly ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2118
            "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2119
            "/ continue to read the commands pipe output
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2120
            "/ and extract revision info records
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2121
            "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2122
            atEnd := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2123
            [atEnd or:[inStream atEnd]] whileFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2124
                record := self readRevisionLogEntryFromStream:inStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2125
                record isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2126
                    atEnd := true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2127
                ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2128
                    revisionRecords add:record.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2129
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2130
                (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2131
                    atEnd := true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2132
                ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2133
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2134
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2135
    ] ensure:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2136
        outputStream notNil ifTrue:[outputStream close].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2137
        self activityNotification:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2138
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2139
    perforceCommand := ('labels "' , depotPath, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2140
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2141
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2142
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2143
        inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2144
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2145
        logHeader:('getting labels ', depotPath, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2146
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2147
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2148
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2149
    inStream := ReadStream on:(outputStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2150
    tags := Dictionary new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2151
    [inStream atEnd not] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2152
        line:= inStream nextLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2153
        line notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2154
            labelLineElements := line asCollectionOfWords.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2155
            elements := labelLineElements size.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2156
            elements > 1 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2157
                label := labelLineElements second withoutSeparators.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2158
                revision := self getRevisionForLabel:label depotPath:depotPath.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2159
                tags at:(labelLineElements second withoutSeparators) put:revision.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2160
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2161
        ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2162
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2163
    info at:#symbolicNames put:tags.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2164
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2165
    ^ info
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2166
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2167
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2168
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2169
    "set a symbolicName for revision rev.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2170
     If rev is nil, set it for the head (most recent) revision.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2171
     If rev is 0, delete the symbolic name.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2172
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2173
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2174
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2175
     If filename is nil, the symbolicName for a whole package is set.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2176
     If multiple pathes are given, the revision MUST be nil."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2177
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2178
    |argumentString result errorStream moduleDirs symbolicName perforceCommand outputStream|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2179
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2180
    symbolicName := (symbolicNameArg includes:Character space) 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2181
                        ifTrue:[ '"',symbolicNameArg,'"' ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2182
                        ifFalse:[ symbolicNameArg ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2183
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2184
    pathesInRepository size > 1 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2185
        self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple pathes"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2186
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2187
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2188
    moduleDirs := pathesInRepository 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2189
                    collect:[:pathInRepository |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2190
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2191
                    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2192
    moduleDirs do:[:moduleDir |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2193
        |pathesInModule pathesInModuleAsArgument|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2194
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2195
        pathesInModule := pathesInRepository
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2196
                    select:[:pathInRepository |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2197
                        |moduleOfThisPath|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2198
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2199
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2200
                        moduleOfThisPath = moduleDir
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2201
                    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2202
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2203
        rev = 0 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2204
            argumentString := ' -d '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2205
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2206
            argumentString := ' -r ', (rev ? 'HEAD').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2207
            overWriteBool ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2208
                argumentString := argumentString, ' -F'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2209
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2210
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2211
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2212
        pathesInModuleAsArgument := pathesInModule 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2213
                                        collect:[:eachPath |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2214
                                            (eachPath includes:Character space) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2215
                                                '"',eachPath,'"'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2216
                                            ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2217
                                                eachPath
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2218
                                            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2219
                                        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2220
        pathesInModuleAsArgument := pathesInModuleAsArgument asStringCollection asStringWith:Character space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2221
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2222
        self activityNotification:'setting symbolic name for: ', pathesInModuleAsArgument.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2223
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2224
        self information:'Implementation not finished yet'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2225
        ^self.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2226
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2227
        perforceCommand := ('label "' , pathesInRepository, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2228
        outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2229
        errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2230
        result := self executePerforceCommand:perforceCommand inDirectory:self root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2231
            inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2232
            errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2233
            logHeader:('set label ', pathesInRepository, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2234
        result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2235
            ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2236
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2237
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2238
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2239
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2240
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2241
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2242
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2243
     self 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2244
        setSymbolicName:'test1' 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2245
        revision:nil 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2246
        overWrite:true 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2247
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2248
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2249
     self 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2250
        setSymbolicName:'test2' 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2251
        revision:nil 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2252
        overWrite:true 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2253
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2254
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2255
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2256
     self 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2257
        setSymbolicName:'test2' 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2258
        revision:0 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2259
        overWrite:true 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2260
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2261
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2262
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2263
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2264
    "Created: / 12-09-2006 / 12:36:44 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2265
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2266
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2267
streamFor:checkInDefinition revision:revision cache:doCache
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2268
    "extract a classes source code and return an open readStream on it.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2269
     A revision of nil selects the current (in image) revision.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2270
     The classes source code is extracted using the revision and the sourceCodeInfo,
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2271
     which itself is extracted from the classes packageString."
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2272
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2273
    |cacheIt cacheDir classFileName fullName cachedSourceFilename cacheSubDir cachedFile tempdir checkoutName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2274
     checkoutNameLocal revMsg fullTempName fullCachedName stream tempFile outStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2275
     line modulDir lineNr result outputStream errorStream inStream cls module packageDir packagePath fullFilename perforceCommand|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2276
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2277
    cacheIt := doCache.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2278
    (cacheIt and:[revision ~~ #newest and:[revision notNil]]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2279
        (cacheDir := PerforceSourceCodeManager sourceCacheDirectory) isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2280
            'PerforceSourceCodeManager [warning]: no source cache directory' errorPrintCR.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2281
        ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2282
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2283
    self getTemporaryWorkspaceFor:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2284
    cls := checkInDefinition definitionClass.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2285
    classFileName := checkInDefinition fileName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2286
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2287
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2288
    (classFileName endsWith:',v') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2289
        classFileName := classFileName copyWithoutLast:2.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2290
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2291
    (classFileName endsWith:'.st') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2292
        cls notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2293
            classFileName := classFileName copyWithoutLast:3.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2294
        ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2295
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2296
    module :=  checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2297
    packageDir := checkInDefinition packageDir.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2298
    fullName := module , '/' , packageDir , '/' , classFileName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2299
    cls notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2300
        fullName := fullName , '.st'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2301
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2302
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2303
    (revision isNil or:[revision == #newest]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2304
        cachedSourceFilename := classFileName, '_p4'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2305
        revMsg := ''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2306
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2307
        cachedSourceFilename := classFileName , '_p4_' , revision.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2308
        revMsg := ' (' , revision , ')'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2309
    ].                                               
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2310
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2311
    cacheDir notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2312
        cacheSubDir := cacheDir construct:module.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2313
        cacheSubDir := cacheSubDir construct:packageDir.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2314
        cachedFile := cacheSubDir construct:cachedSourceFilename.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2315
        cachedFile exists ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2316
            ^ cachedFile readStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2317
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2318
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2319
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2320
    "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2321
    "/ first, create a temporary work tree
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2322
    "/ Do not make module and package directories, their existence cause cvs checkout to fail in server mode
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2323
    "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2324
    tempdir := self tempDirectory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2325
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2326
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2327
    "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2328
    "/ check it out there
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2329
    "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2330
    checkoutName :=  fullName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2331
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2332
    modulDir := module asFilename construct:packageDir.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2333
    checkoutNameLocal := modulDir constructString:(fullName asFilename baseName).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2334
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2335
    self activityNotification:'checking out source ' , checkoutName , revMsg.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2336
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2337
    packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2338
    fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2339
    fullTempName := self getTemporaryFilenameFor:fullFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2340
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2341
    perforceCommand := ('print "' , fullFilename pathName, '#', revision, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2342
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2343
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2344
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2345
        inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2346
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2347
        logHeader:('get contents of ', fullFilename pathName, ' for revision ', revision, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2348
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2349
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2350
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2351
    errorStream contents notEmpty ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2352
        ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2353
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2354
    FileStream openErrorSignal handle:[:ex|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2355
        ('PerforceSourceCodeManager [error]: can not create ', fullTempName pathName) errorPrintCR.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2356
        ^ nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2357
    ] do:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2358
        fullTempName directory recursiveMakeDirectory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2359
        outStream := fullTempName writeStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2360
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2361
    lineNr := 1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2362
    inStream := ReadStream on:(outputStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2363
    [inStream atEnd not] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2364
        line:= inStream nextLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2365
        line notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2366
            lineNr = 1 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2367
            ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2368
                outStream nextPutLine:line.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2369
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2370
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2371
        lineNr := lineNr + 1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2372
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2373
    outStream close.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2374
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2375
    (cacheSubDir isNil) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2376
        cacheIt := false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2377
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2378
        cacheSubDir recursiveMakeDirectory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2379
        fullCachedName := cacheSubDir constructString:cachedSourceFilename.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2380
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2381
    (cacheIt
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2382
    and:[cachedFile notNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2383
    and:[fullTempName exists]])
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2384
    ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2385
        (OperatingSystem errorSignal catch:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2386
            fullTempName moveTo:fullCachedName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2387
        ]) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2388
            ('PerforceSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2389
            ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2390
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2391
        fullCachedName asFilename exists ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2392
            stream := fullCachedName asFilename readStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2393
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2394
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2395
        checkInDefinition fileName = 'extensions.st' ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2396
            self activityNotification:'Not cached - please check your settings and/or the version method in the projectDefinition.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2397
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2398
            self activityNotification:'Not cached - please check your settings.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2399
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2400
        OperatingSystem isUNIXlike ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2401
            "/ cannot remove files which are still open ...
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2402
            "/ sigh - need a delete-on-close flag in FileStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2403
            "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2404
            tempFile := Filename newTemporary.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2405
            fullTempName copyTo:tempFile.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2406
            stream := tempFile readStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2407
            stream notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2408
                stream removeOnClose:true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2409
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2410
        ] ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2411
            stream := fullTempName readStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2412
        ]
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2413
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2414
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2415
    ^ stream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2416
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2417
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2418
submit
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2419
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2420
    |numbers|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2421
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2422
    numbers := self getCurrentChangeListNumbers.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2423
    numbers isEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2424
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2425
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2426
    numbers do:[:aNumber|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2427
        (self submitChangeNumber:aNumber) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2428
            ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2429
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2430
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2431
    ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2432
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2433
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2434
submitChangeNumber:changeNumber
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2435
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2436
    |cmd outputStream errorStream result changeListDescription infoDialog logMsg|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2437
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2438
    changeListDescription := self getChangeDespriptionInfoFor:changeNumber printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2439
    infoDialog := PerforceSourceCodeManager submitInfoDialogClass 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2440
            getCheckinInfoFor:'Perforce submit message check'                
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2441
            initialAnswer:((changeListDescription at:#Description ifAbsent:'') copy)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2442
            withFileList:(changeListDescription at:#Files ifAbsent:'').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2443
    infoDialog notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2444
        logMsg := infoDialog logMessage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2445
        (changeListDescription at:#Description ifAbsent:'') ~= logMsg asStringCollection ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2446
            self changeChangeDescriptionTo:logMsg asStringCollection changeNumber:changeNumber printString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2447
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2448
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2449
    cmd := ('submit -c ', changeNumber printString).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2450
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2451
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2452
    result := self temporaryWorkSpace executePerforceCommand:cmd
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2453
                        inDirectory:self tempDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2454
                        inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2455
                        outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2456
                        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2457
                        doLog:false.                     
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2458
    result ifFalse:[   
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2459
        result := self mergeOrResolveConflictsForChangeNumber:changeNumber.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2460
        result ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2461
            cmd := ('submit -c ', changeNumber printString).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2462
            outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2463
            errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2464
            result := self temporaryWorkSpace executePerforceCommand:cmd
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2465
                                inDirectory:self tempDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2466
                                inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2467
                                outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2468
                                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2469
                                logHeader:('submit change ', changeNumber printString, ' after resolve.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2470
            result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2471
                ^ false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2472
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2473
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2474
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2475
    ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2476
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2477
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2478
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'basic administration'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2479
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2480
initialRevisionInfo:checkInDefinition
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2481
    "return a string usable as initial revision string"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2482
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2483
    |version workSpace foundView packagePath fullFilename depotPath|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2484
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2485
    checkInDefinition definitionClass isPrivate ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2486
        PerforceSourceCodeManager reportError:'refuse to get revision for private classes.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2487
        ^ nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2488
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2489
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2490
    "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2491
    "/ first, create a temporary work tree
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2492
    "/
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2493
"/    tempdir := checkInDefinition tempDirectory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2494
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2495
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2496
    workSpace := PerforceSourceCodeManager getWorkSpaceForPackage:(checkInDefinition packageString).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2497
    workSpace isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2498
        ('PerforceSourceCodeManager [error]: failed to create workspace for', checkInDefinition definitionObjectString)  errorPrintCR.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2499
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2500
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2501
    checkInDefinition workSpace:workSpace.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2502
    version := PerforceSourceCodeManager versionInfoClass new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2503
    foundView := workSpace getViewForPackage:checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2504
    packagePath := Smalltalk packageDirectoryForPackageId:checkInDefinition package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2505
    fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2506
    depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2507
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2508
    version repositoryPathName:depotPath.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2509
    version user:workSpace owner.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2510
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2511
    s := CharacterWriteStream on:(String basicNew:40).    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2512
    Date today printOn:s format:'%d-%m-%y' language:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2513
    version date:s contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2514
    s := CharacterWriteStream on:(String basicNew:40).    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2515
    Timestamp now printOn:s format:'%h-%m-%s.%i'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2516
    version time:s contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2517
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2518
    version revision:'1'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2519
    ^ version.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2520
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2521
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2522
self initialRevisionStringFor:RTDBInspectorStartup inModule:'applistx' directory:'util/rtdb' container:'RTDBInterfaceInspector.st'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2523
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2524
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2525
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2526
initialRevisionStringFor:checkInDefinition
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2527
    "return a string usable as initial revision string"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2528
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2529
    |info|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2530
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2531
    info := self initialRevisionInfo:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2532
    info notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2533
        ^info getVersionString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2534
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2535
    ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2536
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2537
self initialRevisionStringFor:RTDBInspectorStartup inModule:'applistx' directory:'util/rtdb' container:'RTDBInterfaceInspector.st'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2538
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2539
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2540
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2541
nextRevisionStringFor:checkInDefinition
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2542
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2543
    |versionInfo s newestRevisionNumber versionMethod versionString|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2544
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2545
    versionMethod := checkInDefinition definitionClass findVersionMethodOfManager:PerforceSourceCodeManager.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2546
    versionMethod notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2547
        versionString := (versionMethod valueWithReceiver:(checkInDefinition definitionClass theNonMetaclass) arguments:#()).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2548
        versionString notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2549
            versionInfo := PerforceSourceCodeManager versionInfoClass fromRCSString:versionString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2550
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2551
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2552
    versionInfo isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2553
        versionInfo := self initialRevisionInfo:checkInDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2554
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2555
        versionInfo user:checkInDefinition workSpace owner.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2556
        s := CharacterWriteStream on:(String basicNew:40).    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2557
        Date today printOn:s format:'%d-%m-%y' language:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2558
        versionInfo date:s contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2559
        s := CharacterWriteStream on:(String basicNew:40).    
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2560
        Timestamp now printOn:s format:'%h-%m-%s.%i'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2561
        versionInfo time:s contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2562
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2563
    versionInfo isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2564
        ^nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2565
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2566
    newestRevisionNumber := checkInDefinition getReposRevisionNumberBeforeCheckin.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2567
    newestRevisionNumber isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2568
        ^nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2569
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2570
    versionInfo revision:((newestRevisionNumber + 1) printString).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2571
    ^versionInfo getVersionString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2572
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2573
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2574
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'command execution'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2575
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2576
executePerforceCommand:perforceCommand inDirectory:dirArg 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2577
        inputFrom:inputStream outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2578
        errorTo:errorStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2579
    "execute command and prepend perforce command name and global options.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2580
     execute command in the dirArg directory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2581
     The doLog argument, if false supresses a logEntry to be added
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2582
     in the cvs log file (used when reading / extracting history)"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2583
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2584
    ^self executePerforceCommand:perforceCommand inDirectory:dirArg 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2585
        inputFrom:inputStream outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2586
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2587
        doLog:true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2588
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2589
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2590
executePerforceCommand:perforceCommand inDirectory:dirArg 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2591
        inputFrom:inputStream outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2592
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2593
        doLog:doLog
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2594
    "execute command and prepend perforce command name and global options.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2595
     execute command in the dirArg directory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2596
     The doLog argument, if false supresses a logEntry to be added
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2597
     in the cvs log file (used when reading / extracting history)"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2598
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2599
    ^self executePerforceCommand:perforceCommand inDirectory:dirArg 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2600
            inputFrom:inputStream outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2601
            errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2602
            doLog:doLog
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2603
            logHeader:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2604
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2605
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2606
executePerforceCommand:perforceCommand inDirectory:dirArg 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2607
        inputFrom:inputStream outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2608
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2609
        doLog:doLog
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2610
        logHeader:logHeader
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2611
    "execute command and prepend perforce command name and global options.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2612
     execute command in the dirArg directory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2613
     The doLog argument, if false supresses a logEntry to be added
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2614
     in the cvs log file (used when reading / extracting history)"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2615
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2616
    |command rslt pathOfDir errorString  timeout errorMsgStream executeStream|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2617
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2618
    dirArg notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2619
        pathOfDir := dirArg asFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2620
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2621
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2622
    command := self getCommandOptionsForCommand:perforceCommand.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2623
    Processor isDispatching ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2624
        rslt := OperatingSystem executeCommand:command
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2625
                        inputFrom:inputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2626
                        outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2627
                        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2628
                        auxFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2629
                        inDirectory:pathOfDir
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2630
                        lineWise:true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2631
                        onError:[:status| false].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2632
    ] ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2633
        PerforceCommandSemaphore critical:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2634
            |p |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2635
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2636
            p := [
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2637
                rslt := OperatingSystem executeCommand:command
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2638
                                inputFrom:inputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2639
                                outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2640
                                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2641
                                auxFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2642
                                inDirectory:pathOfDir
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2643
                                lineWise:true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2644
                                onError:[:status| false].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2645
            ] fork.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2646
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2647
            timeout := (p waitUntilTerminatedWithTimeout:300). 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2648
            timeout ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2649
                ('PerforceSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2650
                rslt := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2651
                errorString := 'Perforce command timeout'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2652
            ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2653
                rslt ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2654
                    errorString := ('PerforceSourceCodeManager [info]: command failed: ' , command).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2655
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2656
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2657
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2658
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2659
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2660
    PerforceSourceCodeManager verboseSourceCodeAccess == true ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2661
        executeStream := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2662
        executeStream nextPutAll:AbsoluteTime now printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2663
        executeStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2664
        executeStream nextPutAll:('Command <', command, '>').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2665
        executeStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2666
        executeStream nextPutAll:('StdErr Output: <', errorStream contents, '>').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2667
        executeStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2668
        executeStream nextPutAll:('StdOut Output: <', outputStream contents, '>').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2669
        executeStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2670
        executeStream nextPutAll:('##############################').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2671
        Transcript showCR:executeStream contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2672
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2673
    rslt ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2674
        doLog ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2675
            errorMsgStream := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2676
            logHeader notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2677
                errorMsgStream nextPutAll:'Error '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2678
                errorMsgStream nextPutAll:logHeader.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2679
                errorMsgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2680
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2681
            timeout ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2682
                errorMsgStream nextPutAll:('Timeout command <', command, '>').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2683
                errorMsgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2684
            ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2685
                errorMsgStream nextPutAll:('Command <', command, '>').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2686
                errorMsgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2687
                errorMsgStream nextPutAll:('Error output: ', errorStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2688
                outputStream contents notEmpty ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2689
                    errorMsgStream nextPutAll:('Output: ', outputStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2690
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2691
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2692
            self perforceError raiseErrorString:errorMsgStream contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2693
            SourceCodeManagerError isHandled ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2694
                SourceCodeManagerError raiseErrorString:errorMsgStream contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2695
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2696
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2697
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2698
    ^ rslt.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2699
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2700
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2701
executePerforceCommand:perforceCommand inDirectory:dirArg 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2702
        inputFrom:inputStream outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2703
        errorTo:errorStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2704
        logHeader:logHeader
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2705
    "execute command and prepend perforce command name and global options.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2706
     execute command in the dirArg directory.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2707
     The doLog argument, if false supresses a logEntry to be added
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2708
     in the cvs log file (used when reading / extracting history)"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2709
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2710
    ^self executePerforceCommand:perforceCommand inDirectory:dirArg 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2711
        inputFrom:inputStream outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2712
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2713
        doLog:true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2714
        logHeader:logHeader.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2715
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2716
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2717
getCommandOptionsForCommand:perforceCommand
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2718
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2719
    |commandStream executable port user password clientString|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2720
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2721
    commandStream := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2722
    executable := PerforceSourceCodeManager perforceExecutable.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2723
    (executable includes:Character space) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2724
        commandStream nextPut:$".
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2725
        commandStream nextPutAll:executable.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2726
        commandStream nextPut:$".
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2727
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2728
        commandStream nextPutAll:executable.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2729
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2730
    commandStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2731
    port := self perforceSettings at:#port ifAbsent:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2732
    port notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2733
        commandStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2734
        commandStream nextPutAll:'-p '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2735
        commandStream nextPutAll:port.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2736
        commandStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2737
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2738
    clientString := self perforceSettings at:#client ifAbsent:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2739
    clientString notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2740
        commandStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2741
        commandStream nextPutAll:'-c '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2742
        commandStream nextPutAll:clientString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2743
        commandStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2744
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2745
    user := self perforceSettings at:#user ifAbsent:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2746
    user notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2747
        commandStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2748
        commandStream nextPutAll:'-u '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2749
        commandStream nextPutAll:user.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2750
        commandStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2751
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2752
    password := self perforceSettings at:#password ifAbsent:nil.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2753
    password notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2754
        commandStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2755
        commandStream nextPutAll:'-P '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2756
        commandStream nextPutAll:password.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2757
        commandStream space.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2758
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2759
    commandStream nextPutAll:perforceCommand.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2760
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2761
    ^ commandStream contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2762
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2763
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2764
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'dialogs & helpers'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2765
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2766
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2767
    "trouble checking in - open a dialog"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2768
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2769
    ^ self
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2770
        checkinTroubleDialog:title
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2771
        message:message
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2772
        log:log
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2773
        abortable:abortable
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2774
        option:optionTitle
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2775
        option2:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2776
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2777
    "Created: 10.12.1995 / 17:34:33 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2778
    "Modified: 12.9.1996 / 02:39:06 / cg"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2779
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2780
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2781
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2782
    ^self
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2783
        checkinTroubleDialog:title
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2784
        message:message
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2785
        log:log
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2786
        abortable:abortable
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2787
        option:optionTitle
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2788
        option2:optionTitle2
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2789
        option3:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2790
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2791
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2792
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2793
    "trouble checking in - open a dialog"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2794
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2795
    |l box list listView optionPressed option2Pressed option3Pressed|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2796
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2797
    l := log collect:[:line | line withTabsExpanded].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2798
    list := SelectionInList with:l.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2799
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2800
    box := Dialog new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2801
    box label:(title).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2802
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2803
    (box addTextLabel:message) borderWidth:0.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2804
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2805
    l asString notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2806
        listView := SelectionInListView on:list.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2807
        listView disable.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2808
        listView height:(listView heightOfContents max:250).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2809
        box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2810
        box addVerticalSpace.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2811
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2812
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2813
    abortable ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2814
        box addAbortButton
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2815
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2816
    optionTitle notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2817
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2818
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2819
    optionTitle2 notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2820
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2821
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2822
    optionTitle3 notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2823
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2824
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2825
    box addOkButton.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2826
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2827
    box extent:(box preferredExtent).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2828
    box minExtent:box extent.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2829
    box maxExtent:box extent.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2830
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2831
    box open.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2832
    box destroy.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2833
    optionPressed == true ifTrue:[^ #option].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2834
    option2Pressed == true ifTrue:[^ #option2].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2835
    option3Pressed == true ifTrue:[^ #option3].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2836
    ^ box accepted
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2837
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2838
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2839
| changesAsLogged |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2840
changesAsLogged := OrderedCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2841
1 to:10 do:[:each|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2842
    changesAsLogged add:('Hallo', each printString).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2843
].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2844
changesAsLogged := OrderedCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2845
self checkinTroubleDialog:'Version conflict'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2846
             message:'Message Message Message Message Message Message Message Message Message Message Message Message Message Message'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2847
             log:changesAsLogged
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2848
             abortable:false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2849
             option:'show conflicts'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2850
             option2:'resolve conflicts'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2851
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2852
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2853
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2854
diffTextComment
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2855
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2856
    |ws|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2857
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2858
    ws := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2859
    ws nextPutLine:'"/ ***************************************************************'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2860
    ws nextPutLine:'"/ This text contains your current versions code (blue)'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2861
    ws nextPutLine:'"/ merged with the conflicting code as found in the repository (red) which resulted'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2862
    ws nextPutLine:'"/ from some other checkin.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2863
    ws nextPutLine:'"/ Each such conflict is surrounded by green text (like this paragraph).'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2864
    ws nextPutLine:'"/ '.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2865
    ws nextPutLine:'"/ Please have a look at ALL the conflicts and fix things as appropriate.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2866
    ws nextPutLine:'"/ Delete the green lines as a confirmation - I will not checkin the changed text,'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2867
    ws nextPutLine:'"/ unless no more green parts are present. This includes this comment at the top.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2868
    ws nextPutLine:'"/ ***************************************************************'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2869
    ^ ws contents
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2870
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2871
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2872
getRevisionForLabel:label depotPath:depotPath
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2873
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2874
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2875
    |perforceCommand outputStream errorStream result inStream line depotAndRevision|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2876
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2877
    perforceCommand := ('files "@' , label, '"').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2878
    outputStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2879
    errorStream := ReadWriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2880
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2881
        inputFrom:nil outputTo:outputStream 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2882
        errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2883
        logHeader:('getting revision for label ', label, '.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2884
    result ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2885
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2886
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2887
    inStream := ReadStream on:(outputStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2888
    [inStream atEnd not] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2889
        line:= inStream nextLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2890
        line notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2891
            (line startsWith:depotPath) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2892
                depotAndRevision := line asCollectionOfWords first.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2893
                depotAndRevision := depotAndRevision asCollectionOfSubstringsSeparatedBy:$#.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2894
                ^ depotAndRevision second
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2895
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2896
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2897
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2898
    ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2899
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2900
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2901
messageForChangesInClass:class revision:revisionNumber
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2902
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2903
    |msgStream|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2904
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2905
    msgStream := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2906
    msgStream nextPutAll:'The source of '; nextPutAll:class className; nextPutAll:'has been changed in the meanwhile as listed below.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2907
    msgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2908
    msgStream nextPutAll:'If you continue, your new changes (based upon rev. '; nextPutAll:revisionNumber printString; nextPutAll:') will be MERGED'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2909
    msgStream nextPutAll:'into the newest revision. This will combine the other version with your changes'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2910
    msgStream nextPutAll:'into a new common revision which may be different from both.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2911
    msgStream nextPutAll:'Although this is a nice feature, it may fail to create the expected result in certain situations.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2912
    msgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2913
    msgStream nextPutAll:'You should carefully check the result - by comparing the current version with the'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2914
    msgStream nextPutAll:'most recent version in the repository. If that does not contain an acceptable version,'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2915
    msgStream nextPutAll:'change methods as required and check in again.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2916
    msgStream nextPutAll:'Be aware, that after that, the actual repository version is different from your current classes,'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2917
    msgStream nextPutAll:'and you should update your class from the repository.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2918
    msgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2919
    msgStream nextPutAll:'Continue ?'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2920
    ^ msgStream contents
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2921
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2922
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2923
messageForConflictsInClass:definitionClass revision:revisionNumber
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2924
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2925
    |msgStream|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2926
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2927
    msgStream := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2928
    msgStream nextPutAll:'The source of '; nextPutAll:definitionClass className; nextPutAll:' has been changed in the meanwhile as listed below.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2929
    msgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2930
    msgStream nextPutAll:'Your new changes (based upon rev. '; nextPutAll:revisionNumber printString; nextPutAll:') CONFLICT with those changes'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2931
    msgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2932
    msgStream nextPutAll:'You should fix things by comparing your class with the most recent repository version'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2933
    msgStream nextPutAll:'and change your methods avoiding conflicts. The checkin again.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2934
    msgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2935
    ^ msgStream contents
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2936
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2937
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2938
messageForNoChangesInClass:class
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2939
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2940
    |msgStream|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2941
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2942
    msgStream := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2943
    msgStream nextPutAll:'The source of '; nextPutAll:class className; nextPutAll:'has been changed in the meanwhile as listed below.'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2944
    msgStream cr.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2945
    msgStream nextPutAll:'I have merged your version with the newest repository version,'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2946
    msgStream nextPutAll:'and found no differences between the result and your current version'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2947
    msgStream nextPutAll:'(i.e. your version seemed up-to-date).'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2948
    ^ msgStream contents
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2949
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2950
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2951
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2952
    "update a revision string"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2953
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2954
    |versionInfo packageID module foundView packagePath fullFilename depotPath sourceInfo classFileName|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2955
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2956
    originalVersionString isEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2957
        packageID := PackageId from:aClass package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2958
        module := packageID module.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2959
        foundView := self getViewForPackage:module.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2960
        packagePath := Smalltalk packageDirectoryForPackageId:module.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2961
        sourceInfo := PerforceSourceCodeManager sourceInfoOfClass:aClass.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2962
        sourceInfo isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2963
            PerforceSourceCodeManager reportError:('no sourceInfo for class: ' , aClass name).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2964
            ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2965
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2966
        classFileName := PerforceSourceCodeManager containerFromSourceInfo:sourceInfo.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2967
        fullFilename := (packagePath construct:packageID directory) construct:classFileName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2968
        depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2969
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2970
        versionInfo := PerforceSourceCodeManager versionInfoClass fromRepositoryPathName:depotPath.        
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2971
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2972
        versionInfo := PerforceSourceCodeManager versionInfoClass fromRCSString:originalVersionString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2973
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2974
    versionInfo revision:newRevision printString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2975
    ^ versionInfo getVersionString.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2976
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2977
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2978
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2979
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2980
    self updatedRevisionStringOf:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2981
            forRevision:'6'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2982
            with:'$','Header','$'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2983
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2984
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2985
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2986
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'initialization'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2987
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2988
initialize
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2989
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2990
    PerforceCommandSemaphore := Semaphore new:10.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2991
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2992
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2993
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'queries'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2994
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2995
getDepotPathForLocalPath:aFilename
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2996
    |view|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2997
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2998
    view := self getViewForPath:aFilename.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  2999
    view isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3000
        ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3001
    ].             
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3002
    ^view getDepotPathForLocalPath:aFilename
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3003
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3004
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3005
getLocalPathForDepotPath:depotPath
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3006
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3007
    |view|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3008
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3009
    view := self getViewForDepotPath:depotPath.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3010
    view notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3011
        ^view getLocalPathForDepotPath:depotPath.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3012
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3013
    ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3014
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3015
     | workSpace tempWorkSpace |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3016
    workSpace := PerforceSourceCodeManager getWorkSpaceForPackage:'applistx'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3017
    tempWorkSpace := workSpace temporaryWorkSpace.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3018
    tempWorkSpace getLocalPathForDepotPath:'//depot/applistx/util/libDataType/ActionLQualifier.st'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3019
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3020
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3021
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3022
getTemporaryFilenameFor:aFilename
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3023
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3024
    |myView checkInPart fullTempFilename|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3025
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3026
    myView := self getViewForPath:aFilename.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3027
    self temporaryWorkSpace isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3028
        ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3029
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3030
    self temporaryWorkSpace views do:[:aView|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3031
        myView depot = aView depot ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3032
            checkInPart := PerforceSourceCodeManager getTrailungPathNameFrom:aFilename with:myView localPathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3033
            fullTempFilename := aView localPathName asFilename construct:checkInPart.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3034
            ^fullTempFilename
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3035
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3036
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3037
    ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3038
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3039
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3040
getTemporaryViewForPackage:aPackage
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3041
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3042
    |myView|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3043
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3044
    myView := self getViewForPackage:aPackage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3045
    self temporaryWorkSpace isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3046
        ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3047
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3048
    self temporaryWorkSpace views do:[:aView|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3049
        myView depot = aView depot ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3050
            ^ aView
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3051
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3052
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3053
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3054
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3055
getViewForDepotPath:depotPath
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3056
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3057
    |myHostName|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3058
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3059
    myHostName := OperatingSystem getHostName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3060
    (myHostName endsWith:OperatingSystem getDomainName) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3061
        myHostName := myHostName copyTo:(myHostName size - (OperatingSystem getDomainName size + 1)).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3062
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3063
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3064
    (myHostName asLowercase startsWith:(self host asLowercase)) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3065
        self perforceError raiseErrorString:('Client ', (perforceSettings at:#client), ' is made for host ', self host, ' and not for ', myHostName).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3066
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3067
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3068
    self views do:[:aView |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3069
        (aView hasViewForDepotPath:depotPath) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3070
            ^aView
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3071
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3072
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3073
    self perforceError raiseErrorString:('Client ', (perforceSettings at:#client), ' have no View for depot path ', depotPath).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3074
    ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3075
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3076
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3077
getViewForPackage:aPackage 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3078
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3079
    |locPackage packagePath|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3080
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3081
    aPackage isNil ifTrue:[                              
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3082
        locPackage := Smalltalk package.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3083
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3084
        locPackage := aPackage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3085
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3086
    packagePath := self packageDirectoryForPackageId:locPackage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3087
    packagePath notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3088
        packagePath := packagePath pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3089
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3090
        self perforceError raiseErrorString:('no package path for ', aPackage printString).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3091
        ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3092
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3093
    ^self getViewForPath:packagePath
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3094
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3095
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3096
    PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applistx:application/rtdbInspector/builder'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3097
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3098
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3099
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3100
getViewForPath:aPathName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3101
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3102
    |myHostName|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3103
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3104
    myHostName := OperatingSystem getHostName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3105
    (myHostName endsWith:OperatingSystem getDomainName) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3106
        myHostName := myHostName copyTo:(myHostName size - (OperatingSystem getDomainName size + 1)).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3107
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3108
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3109
    (myHostName asLowercase startsWith:(self host asLowercase)) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3110
        self perforceError raiseErrorString:('Client ', (perforceSettings at:#client), ' is made for host ', self host, ' and not for ', myHostName).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3111
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3112
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3113
    self views do:[:aView |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3114
        (aView hasViewForPath:aPathName) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3115
            ^aView
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3116
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3117
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3118
    self perforceError raiseErrorString:('Client ', (perforceSettings at:#client), ' have no View for path ', aPathName).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3119
    ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3120
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3121
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3122
hasViewForPackage:aPackage 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3123
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3124
    ^(self getViewForPackage:aPackage) notNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3125
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3126
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3127
hasViewForPath:aPathName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3128
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3129
    ^(self getViewForPath:aPathName) notNil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3130
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3131
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3132
packageDirectoryForPackageId:package
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3133
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3134
    ^self packageDirectoryForPackageId:package checkParents:true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3135
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3136
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3137
    PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applisddtx:application/rtdbInspector/builder'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3138
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3139
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3140
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3141
packageDirectoryForPackageId:package checkParents:checkParents
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3142
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3143
    |locPackage packagePath|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3144
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3145
    locPackage := package copyReplaceAll:$: with:$/.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3146
    [ packagePath isNil ] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3147
        packagePath := Smalltalk packageDirectoryForPackageId:locPackage.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3148
        packagePath notNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3149
            ^packagePath
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3150
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3151
        locPackage := locPackage asFilename directoryName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3152
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3153
    ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3154
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3155
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3156
    PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applisddtx:application/rtdbInspector/builder'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3157
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3158
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3159
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3160
perforceError
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3161
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3162
    ^ PerforceSourceCodeManager perforceError
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3163
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3164
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3165
perforceSettingsString
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3166
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3167
    ^ PerforceSourceCodeManager getStringFromPerforceSettings:self perforceSettings
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3168
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3169
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3170
readRevisionLogEntryFromStream:inStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3171
    "read and parse a single revision info-entry from the cvs log output.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3172
     Return nil on end.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3173
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3174
     The returned information is a structure (IdentityDictionary)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3175
     filled with:
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3176
              #revision              -> the revision string
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3177
              #author                -> who checked that revision into the repository
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3178
              #date                  -> when was it checked in
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3179
              #state                 -> the RCS state
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3180
              #numberOfChangedLines  -> the number of changed line w.r.t the previous
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3181
              #logMessage            -> the checkIn log message
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3182
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3183
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3184
    |revLine1 atEnd|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3185
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3186
    atEnd := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3187
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3188
    revLine1 := inStream nextLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3189
    ^ self readRevisionLogEntryFromString:revLine1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3190
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3191
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3192
readRevisionLogEntryFromString:revLine1
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3193
    "read and parse a single revision info-entry from the cvs log output.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3194
     Return nil on end.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3195
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3196
     The returned information is a structure (IdentityDictionary)
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3197
     filled with:
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3198
              #revision              -> the revision string
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3199
              #author                -> who checked that revision into the repository
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3200
              #date                  -> when was it checked in
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3201
              #state                 -> the RCS state
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3202
              #numberOfChangedLines  -> the number of changed line w.r.t the previous
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3203
              #logMessage            -> the checkIn log message
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3204
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3205
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3206
    | record revisionLineElements noOfRevisionLineElements posText|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3207
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3208
    (revLine1 notNil) ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3209
        record := IdentityDictionary new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3210
        revisionLineElements := revLine1 asCollectionOfWords.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3211
        noOfRevisionLineElements := revisionLineElements size.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3212
        noOfRevisionLineElements > 1 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3213
            record at:#revision put:((revisionLineElements at:2) copyFrom:2).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3214
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3215
        noOfRevisionLineElements > 8 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3216
            record at:#author put:(revisionLineElements at:9).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3217
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3218
        noOfRevisionLineElements > 6 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3219
            record at:#date put:(revisionLineElements at:7).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3220
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3221
        noOfRevisionLineElements > 4 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3222
            record at:#state put:(revisionLineElements at:5).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3223
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3224
        noOfRevisionLineElements > 10 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3225
            posText := 0.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3226
            1 to:9 do:[:ele| posText := posText + (revisionLineElements at:ele) size + 1].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3227
            record at:#logMessage put:(revLine1 copyFrom:posText).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3228
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3229
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3230
    ^record.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3231
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3232
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3233
temporaryClientName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3234
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3235
    ^ 'stxCheckinWorkSpace_', self owner, self host.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3236
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3237
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3238
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'read'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3239
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3240
getDefinitionFromServer
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3241
    |cmd myBaseDirectory outputStream errorStream rslt clients inStream line words|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3242
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3243
    cmd := 'clients -u ' , (self perforceSettings at:#user).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3244
    myBaseDirectory := (Filename currentDirectory asAbsoluteFilename) pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3245
    outputStream := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3246
    errorStream := WriteStream on:''.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3247
    rslt := self  
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3248
                executePerforceCommand:cmd
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3249
                inDirectory:myBaseDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3250
                inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3251
                outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3252
                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3253
                logHeader:('getting workspaces ').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3254
    rslt ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3255
        self perforceError raiseErrorString:(outputStream contents, errorStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3256
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3257
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3258
    clients := OrderedCollection new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3259
    inStream := ReadStream on:(outputStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3260
    [ inStream atEnd not ] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3261
        line := inStream nextLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3262
        line notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3263
            words := line asCollectionOfWords.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3264
            words size > 1 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3265
                clients add:(words at:2).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3266
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3267
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3268
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3269
    (clients includes:(self perforceSettings at:#client ifAbsent:nil)) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3270
        self perforceError raiseErrorString:('No workspace ', (self perforceSettings at:#client ifAbsent:'?'), ' for user ', (self perforceSettings at:#user ifAbsent:'?'), ' on ', (self perforceSettings at:#port ifAbsent:'?'), ' available.').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3271
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3272
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3273
    cmd := 'client -o'.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3274
    myBaseDirectory := (Filename currentDirectory asAbsoluteFilename) pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3275
    outputStream reset.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3276
    errorStream reset.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3277
    rslt := self 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3278
                executePerforceCommand:cmd
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3279
                inDirectory:myBaseDirectory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3280
                inputFrom:nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3281
                outputTo:outputStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3282
                errorTo:errorStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3283
                logHeader:('getting empty workspace definition ').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3284
    rslt ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3285
        self perforceError raiseErrorString:(outputStream contents, errorStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3286
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3287
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3288
    inStream := ReadStream on:(outputStream contents).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3289
    self getWorkSpaceFromClientSpecFrom:inStream.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3290
    ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3291
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3292
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3293
(PerforceSourceCodeManager getWorkSpaceForPackage:'applistx') getDefinitionFromServer
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3294
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3295
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3296
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3297
getWorkSpaceFromClientSpecFrom:inStream
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3298
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3299
        get the workspace definition from perforce client command output
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3300
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3301
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3302
    |line nextKey |
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3303
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3304
    [inStream atEnd not] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3305
        line:= inStream nextLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3306
        line notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3307
                line first = $# ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3308
                (line startsWith:'Owner:') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3309
                    self owner:line asCollectionOfWords second.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3310
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3311
                (line startsWith:'Host:') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3312
                    self host:line asCollectionOfWords second.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3313
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3314
                (line startsWith:'Client:') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3315
                    self client:(line asCollectionOfWords second).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3316
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3317
                (line startsWith:'Root:') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3318
                    self root:((line copyFrom:('Root:' size + 1)) withoutLeadingSeparators).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3319
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3320
                (line startsWith:'View:') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3321
                    nextKey := false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3322
                    [nextKey not and:[inStream atEnd not]] whileTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3323
                        line:= inStream nextLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3324
                        line notEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3325
                            line first isSeparator ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3326
                                self views add:(View newFromLine:line workspace:self).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3327
                            ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3328
                                nextKey := true.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3329
                            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3330
                        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3331
                    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3332
                ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3333
            ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3334
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3335
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3336
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3337
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3338
newWorkSpaceFor:settingsString 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3339
    settingsString isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3340
        ^ nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3341
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3342
    self perforceSettings:(PerforceSourceCodeManager 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3343
                getPerforceSettingsFromString:settingsString).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3344
    self getDefinitionFromServer ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3345
        ^self
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3346
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3347
    ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3348
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3349
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3350
newWorkSpaceForSettings:settingsDict 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3351
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3352
    settingsDict isNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3353
        self perforceError raiseErrorString:('nil settings when creating workspace').
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3354
        ^ self
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3355
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3356
    self perforceSettings:settingsDict.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3357
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3358
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3359
!PerforceSourceCodeManagerUtilities::WorkSpace::View class methodsFor:'instance creation'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3360
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3361
newFromLine:aLine workspace:aWorkspaceDefinition
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3362
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3363
    |instance|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3364
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3365
    instance := self new.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3366
    instance newFromLine:aLine.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3367
    instance workspace:aWorkspaceDefinition.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3368
    ^instance
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3369
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3370
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3371
!PerforceSourceCodeManagerUtilities::WorkSpace::View methodsFor:'accessing'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3372
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3373
depot
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3374
    ^ depot
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3375
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3376
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3377
depot:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3378
    depot := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3379
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3380
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3381
local
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3382
    ^ local
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3383
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3384
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3385
local:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3386
    local := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3387
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3388
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3389
type
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3390
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3391
    " there special types for views 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3392
      + for added to the same directory
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3393
      - exclude this view
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3394
        and standard view
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3395
    "
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3396
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3397
    ^ type
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3398
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3399
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3400
type:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3401
    type := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3402
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3403
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3404
workspace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3405
    ^ workspace
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3406
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3407
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3408
workspace:something
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3409
    workspace := something.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3410
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3411
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3412
!PerforceSourceCodeManagerUtilities::WorkSpace::View methodsFor:'queries'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3413
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3414
getDepotPathForLocalPath:aFilename
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3415
    |depotPath restPath unixRestPath|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3416
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3417
    (self hasViewForPath:aFilename) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3418
        ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3419
    ].                     
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3420
    depotPath := depot.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3421
    (depot endsWith:'...') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3422
        depotPath := depot copyTo:(depot size - 3).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3423
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3424
        depotPath := depot.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3425
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3426
    restPath := PerforceSourceCodeManager getTrailungPathNameFrom:aFilename with:self localPathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3427
    unixRestPath := (UnixFilename fromComponents:(restPath asFilename components)) pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3428
    depotPath := depotPath, unixRestPath.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3429
    ^depotPath.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3430
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3431
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3432
getLocalPathForDepotPath:depotPath
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3433
    |viewDepotPath restPath|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3434
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3435
    (self hasViewForDepotPath:depotPath) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3436
        ^nil
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3437
    ].                     
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3438
    viewDepotPath := depot.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3439
    (depot endsWith:'...') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3440
        viewDepotPath := depot copyTo:(depot size - 3).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3441
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3442
        viewDepotPath := depot.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3443
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3444
    restPath := PerforceSourceCodeManager getTrailungPathNameFrom:depotPath with:viewDepotPath.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3445
    ^ (self localPathName asFilename construct:restPath) pathName.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3446
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3447
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3448
hasViewForDepotPath:depotPath
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3449
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3450
    |viewDepotPath|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3451
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3452
    depotPath isEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3453
        ^ false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3454
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3455
    viewDepotPath := depot.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3456
    (depot endsWith:'...') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3457
        viewDepotPath := depot copyTo:(depot size - 3).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3458
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3459
        viewDepotPath := depot.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3460
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3461
    (PerforceSourceCodeManager path:depotPath hasSamePrefixLikePath:viewDepotPath) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3462
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3463
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3464
    ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3465
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3466
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3467
hasViewForPath:aPathname
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3468
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3469
    aPathname isEmptyOrNil ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3470
        ^ false.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3471
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3472
    (PerforceSourceCodeManager path:aPathname hasSamePrefixLikePath:self localPathName) ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3473
        ^false
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3474
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3475
    ^true
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3476
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3477
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3478
localPathName
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3479
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3480
    |indexOfClientString localPathName|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3481
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3482
    (local endsWith:'...') ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3483
        localPathName := local copyTo:(local size -3).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3484
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3485
        localPathName := local.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3486
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3487
    indexOfClientString := local findString:workspace client.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3488
    indexOfClientString == 0 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3489
        ^workspace root.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3490
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3491
    localPathName := workspace root asFilename construct:(localPathName copyFrom:(indexOfClientString + workspace client size)).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3492
    ^localPathName pathName 
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3493
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3494
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3495
!PerforceSourceCodeManagerUtilities::WorkSpace::View methodsFor:'reading'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3496
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3497
newFromLine:aLine
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3498
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3499
    |words firstIndex secondIndex theLine|
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3500
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3501
    theLine := aLine withoutLeadingSeparators.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3502
    theLine := theLine withoutTrailingSeparators.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3503
    theLine isEmpty ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3504
        ^self
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3505
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3506
    theLine first == $+ ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3507
        type := #+.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3508
        theLine := theLine copyFrom:2.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3509
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3510
    theLine first == $- ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3511
        type := #-.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3512
        theLine := theLine copyFrom:2.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3513
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3514
    (theLine includes:$") ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3515
        "oops we have space directories search for quotes"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3516
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3517
        firstIndex := theLine indexOf:$" startingAt:1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3518
        firstIndex == 1 ifTrue:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3519
            secondIndex := theLine indexOf:$" startingAt:firstIndex + 1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3520
            depot := theLine copyFrom:firstIndex + 1 to:secondIndex - 1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3521
            firstIndex := theLine indexOf:$" startingAt:secondIndex + 1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3522
            secondIndex := theLine indexOf:$" startingAt:firstIndex + 1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3523
            local := theLine copyFrom:firstIndex + 1  to:secondIndex - 1.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3524
        ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3525
            depot := (theLine copyTo:firstIndex - 1) withoutTrailingSeparators.            
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3526
            local := theLine copyFrom:firstIndex + 1 to:(theLine size - 1).
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3527
        ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3528
    ] ifFalse:[
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3529
        words := theLine asCollectionOfWords.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3530
        depot := words first.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3531
        local := words second.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3532
    ].
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3533
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3534
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3535
    View newFromLine:ws contents.
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3536
"
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3537
! !
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3538
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3539
!PerforceSourceCodeManagerUtilities class methodsFor:'documentation'!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3540
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3541
version
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3542
    ^ '$Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagerUtilities.st,v 1.1 2012/06/01 09:16:03 cg Exp $'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3543
!
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3544
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3545
version_CVS
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3546
    ^ '§Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagerUtilities.st,v 1.1 2012/06/01 09:16:03 cg Exp §'
b1237f76f501 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
  3547
! !