PerforceSourceCodeManagerUtilities.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 19 Jul 2017 09:42:32 +0200
branchjv
changeset 17619 edb119820fcb
parent 17136 cb908d2ba02e
child 18226 346376844040
permissions -rw-r--r--
Issue #154: Set window style using `#beToolWindow` to indicate that the minirunner window is kind of support tool rather than some X11 specific code (which does not work on Windows of course) See https://swing.fit.cvut.cz/projects/stx-jv/ticket/154
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13823
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     1
"
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     2
 COPYRIGHT (c) 2006 by eXept Software AG
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     3
              All Rights Reserved
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     4
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     5
 This software is furnished under a license and may be used
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     6
 only in accordance with the terms of that license and with the
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     8
 be provided or otherwise made available to, or used by, any
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     9
 other person.  No title to or ownership of the software is
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    10
 hereby transferred.
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    11
"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    12
"{ Package: 'stx:libtool' }"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    13
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
    14
"{ NameSpace: Smalltalk }"
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
    15
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    16
SourceCodeManagerUtilities subclass:#PerforceSourceCodeManagerUtilities
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    17
	instanceVariableNames:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    18
	classVariableNames:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    19
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    20
	category:'System-SourceCodeManagement'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    21
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    22
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    23
SimpleDialog subclass:#P4CheckinInfoDialog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    24
	instanceVariableNames:'descriptionHolder logMessageHolder isStableHolder tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
		quickCheckInHolder quickCheckInVisibleHolder allowEmptyLogMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
		warningMessageHolder logHistory logHistoryHeadLineSelectionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    27
		submitHolder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    28
	classVariableNames:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    29
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    30
	privateIn:PerforceSourceCodeManagerUtilities
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    31
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    32
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    33
SimpleDialog subclass:#SubmitInfoDialog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    34
	instanceVariableNames:'descriptionHolder logMessageHolder isStableHolder tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    35
		quickCheckInHolder quickCheckInVisibleHolder allowEmptyLogMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    36
		warningMessageHolder filesHolder tagItInHolder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    37
	classVariableNames:'LastSourceLogMessage'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    38
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    39
	privateIn:PerforceSourceCodeManagerUtilities
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    40
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    41
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    42
Object subclass:#WorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    43
	instanceVariableNames:'client host owner root views perforceSettings temporaryWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    44
		tempDirectory'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    45
	classVariableNames:'PerforceCommandSemaphore'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    46
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    47
	privateIn:PerforceSourceCodeManagerUtilities
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    48
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    49
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    50
Object subclass:#View
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    51
	instanceVariableNames:'depot local workspace type'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    52
	classVariableNames:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    53
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    54
	privateIn:PerforceSourceCodeManagerUtilities::WorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    55
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    56
13823
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    57
!PerforceSourceCodeManagerUtilities class methodsFor:'documentation'!
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    58
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    59
copyright
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    60
"
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    61
 COPYRIGHT (c) 2006 by eXept Software AG
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    62
              All Rights Reserved
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    63
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    64
 This software is furnished under a license and may be used
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    65
 only in accordance with the terms of that license and with the
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    66
 inclusion of the above copyright notice.   This software may not
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    67
 be provided or otherwise made available to, or used by, any
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    68
 other person.  No title to or ownership of the software is
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    69
 hereby transferred.
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    70
"
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    71
! !
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    72
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    73
!PerforceSourceCodeManagerUtilities class methodsFor:'class access'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    75
checkInInfoDialogClass
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    76
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    77
    ^P4CheckinInfoDialog
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    78
!
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    79
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    80
submitInfoDialogClass
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    81
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    82
    ^ SubmitInfoDialog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    83
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    84
    "Created: / 01-06-2012 / 11:09:15 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    85
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    86
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    87
workSpaceClass
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    88
    ^ WorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    89
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    90
    "Created: / 01-06-2012 / 11:13:49 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    91
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    93
!PerforceSourceCodeManagerUtilities methodsFor:'utilities-cvs'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    94
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    95
askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName forNewContainer:forNewContainer
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    96
    "open a dialog asking for a source container;
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    97
     return a dictionary containing module, package and filename,
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    98
     or nil if canceled."
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    99
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   100
    |box y component answer
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   101
     moduleHolder packageHolder fileNameHolder
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   102
     module package fileName
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   103
     knownContainers knownPackages packageUpdater
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   104
     packageBoxComponent fileNameBoxComponent fileNameUpdater|
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   105
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   106
    knownContainers := Set new.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   107
    Smalltalk allClassesDo:[:cls | |pckg|
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   108
        pckg := cls package.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   109
        pckg size > 0 ifTrue:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   110
            knownContainers add:(pckg upTo:$:)
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   111
        ]
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   112
    ].
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   113
    knownContainers := knownContainers asOrderedCollection reject:[:module | module isBlank].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   114
    knownContainers sort.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   115
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   116
    packageUpdater := [
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   117
        |theModulePrefix|
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   118
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   119
        theModulePrefix := moduleHolder value , ':'.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   120
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   121
        Cursor wait showWhile:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   122
            knownPackages := Set new.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   123
            Smalltalk allClassesDo:[:cls | |pckg idx|
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   124
                pckg := cls package.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   125
                pckg size > 0 ifTrue:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   126
                    (pckg startsWith:theModulePrefix) ifTrue:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   127
                        idx := pckg indexOf:$:.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   128
                        knownPackages add:(pckg copyFrom:idx + 1)
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   129
                    ]
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   130
                ]
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   131
            ].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   132
            knownPackages := knownPackages asOrderedCollection.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   133
            knownPackages := knownPackages select:[:package | package isBlank not].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   134
            knownPackages sort.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   135
            packageBoxComponent list:knownPackages.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   136
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   137
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   138
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   139
    fileNameUpdater := [
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   140
        |module package files|
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   141
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   142
        Cursor read showWhile:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   143
            module := moduleHolder value ? (PackageId noProjectID).
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   144
            package := packageHolder value ? (PackageId noProjectID).
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   145
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   146
            files := PerforceSourceCodeManager getExistingContainersInModule:module directory:package.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   147
            files := files asOrderedCollection.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   148
            files := files select:[:eachFile | eachFile asFilename hasSuffix:'st'].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   149
            files sort.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   150
            fileNameBoxComponent list:files.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   151
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   152
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   153
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   154
    moduleHolder := initialModule asValue.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   155
    packageHolder := initialPackage asValue.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   156
    fileNameHolder := initialFileName asValue.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   157
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   158
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   159
    "/ open a dialog for this
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   160
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   161
    box := DialogBox new.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   162
    box label:title.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   163
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   164
    component := box addTextLabel:boxText withCRs.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   165
    component adjust:#left; borderWidth:0.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   166
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   167
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   168
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   169
    y := box yPosition.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   170
    component := box addTextLabel:(resources string:'Module:').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   171
    component width:0.4; adjust:#right.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   172
    box yPosition:y.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   173
    component := box addComboBoxOn:moduleHolder tabable:true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   174
    component list:knownContainers.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   175
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   176
"/    component := box addInputFieldOn:moduleHolder tabable:true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   177
    component width:0.6; left:0.4; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   178
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   179
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   180
    y := box yPosition.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   181
    component := box addTextLabel:(resources string:'Package:').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   182
    component width:0.4; adjust:#right.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   183
    box yPosition:y.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   184
    packageBoxComponent := component := box addComboBoxOn:packageHolder tabable:true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   185
"/    component := box addInputFieldOn:packageHolder tabable:true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   186
    component width:0.6; left:0.4; "immediateAccept:true; "acceptOnLeave:true; cursorMovementWhenUpdating:#beginOfLine.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   187
    packageUpdater value.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   188
    moduleHolder onChangeEvaluate:packageUpdater.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   189
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   190
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   191
    y := box yPosition.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   192
    component := box addTextLabel:(resources string:'Filename:').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   193
    component width:0.4; adjust:#right.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   194
    box yPosition:y.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   195
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   196
    forNewContainer ifTrue:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   197
        component := box addInputFieldOn:fileNameHolder tabable:true.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   198
        component width:0.6; left:0.4; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   199
    ] ifFalse:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   200
        fileNameBoxComponent := component := box addComboBoxOn:fileNameHolder tabable:true.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   201
        component width:0.6; left:0.4; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   202
        fileNameUpdater value.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   203
        packageHolder onChangeEvaluate:fileNameUpdater.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   204
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   205
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   206
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   207
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   208
    notice notNil ifTrue:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   209
        component := box addTextLabel:notice.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   210
        component adjust:#left; borderWidth:0.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   211
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   212
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   213
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   214
    box addAbortAndOkButtons.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   215
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   216
    (YesToAllNotification notNil and:[YesToAllNotification isHandled]) ifTrue:[
15020
76c067348d2b class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14665
diff changeset
   217
        component := Button label:(resources string:'Yes to All').
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   218
        component action:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   219
                            YesToAllNotification queryWith:true.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   220
                            box doAccept.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   221
                            box okPressed.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   222
                         ].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   223
        box addButton:component.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   224
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   225
    (AbortAllSignal isHandled) ifTrue:[
15020
76c067348d2b class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14665
diff changeset
   226
        component := Button label:(resources string:'Cancel All').
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   227
        component action:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   228
                            box hide.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   229
                            AbortAllSignal raiseSignal.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   230
                         ].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   231
        box addButton:component before:nil.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   232
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   233
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   234
    (YesToAllQuery notNil and:[YesToAllQuery isHandled]) ifTrue:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   235
        answer := YesToAllQuery query.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   236
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   237
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   238
    answer isNil ifTrue:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   239
        box showAtPointer.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   240
        answer := box accepted
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   241
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   242
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   243
    box destroy.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   244
    answer ifFalse:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   245
        ^ nil
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   246
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   247
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   248
    module := moduleHolder value withoutSpaces.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   249
    package := packageHolder value withoutSpaces.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   250
    fileName := fileNameHolder value withoutSpaces.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   251
    ^ Dictionary new
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   252
        at:#module put:module;
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   253
        at:#package put:package;
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   254
        at:#fileName put:fileName;
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   255
        yourself
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   256
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   257
    "
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   258
     self
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   259
        askForContainer:'enter container' title:'container' note:'some note'
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   260
        initialModule:'foo' initialPackage:'bar' initialFileName:'baz'
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   261
    "
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   262
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   263
    "Modified: / 29-08-2013 / 12:26:55 / cg"
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   264
!
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   265
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   266
checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClass usingManager:managerOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   267
    "check a class into the source repository.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   268
     If the argument, aLogInfoOrNil isNil, ask interactively for log-message.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   269
     If doCheckClass is true, the class is checked for send of halts etc."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   270
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   271
    |logMessage checkinInfo mgr pri doSubmit|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   272
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   273
    doSubmit := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   274
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   275
    aClass isLoaded ifFalse:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   276
        self information:(resources string:'Cannot checkin unloaded classes (%1)' with:aClass name).
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   277
        ^ false.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   278
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   279
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   280
    mgr := managerOrNil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   281
    mgr isNil ifTrue:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   282
        mgr := self sourceCodeManagerFor:aClass.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   283
        mgr isNil ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   284
            ^ false
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   285
        ]
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   286
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   287
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   288
    self ensureCorrectVersionMethodsInClass:aClass usingManager:mgr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   289
    mgr supportsCheckinLogMessages ifTrue:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   290
        (self
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   291
            getLogMessageForClassCheckinTakingDefaultsFromPreviousLogInfo:aLogInfoOrNil
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   292
            forClass:aClass
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   293
            valuesInto:[:logMessageRet :checkinInfoRet |
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   294
                logMessage := logMessageRet.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   295
                checkinInfo := checkinInfoRet.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   296
                checkinInfo notNil ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   297
                    doSubmit := checkinInfo submitHolder value.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   298
                ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   299
            ]
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   300
        ) ifFalse:[^ false].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   301
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   302
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   303
    (self classIsNotYetInRepository:aClass withManager:mgr) ifTrue:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   304
        (self createSourceContainerForClass:aClass usingManager:mgr) ifFalse:[
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   305
"/            self warn:'did not create a container for ''' , aClass name , ''''.
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   306
            ^ false
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   307
        ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   308
        ^ true.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   309
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   310
16954
5e6f9500fc12 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 16876
diff changeset
   311
    self activityNotification:(resources string:'PerforceSourceCodeManager [info]: checking in %1' with:aClass name).
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   312
    pri := Processor activePriority.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   313
    Processor activeProcess withPriority:pri-1 to:pri
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   314
    do:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   315
        |revision aborted|
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   316
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   317
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   318
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   319
        aborted := false.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   320
        AbortOperationRequest handle:[:ex |
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   321
            aborted := true.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   322
            ex return.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   323
        ] do:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   324
            |checkinState cause|
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   325
            checkinState := false.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   326
            cause := ''.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   327
            [
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   328
                checkinState := mgr checkinClass:aClass logMessage:logMessage submit:doSubmit
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   329
            ] on:SourceCodeManagerError do:[:ex|
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   330
                cause := ex description.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   331
                ex proceed.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   332
            ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   334
            checkinState ifFalse:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   335
                Transcript showCR:'checkin of ''' , aClass name , ''' failed - ', cause.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   336
                self warn:(resources stringWithCRs:'Checkin of "%1" failed\\' with:aClass name allBold),cause.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   337
                ^ false.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   338
            ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   339
            checkinInfo notNil ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   340
                checkinInfo isStable ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   341
                    "set stable tag for class that has been checked in"
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   342
                    self tagClass:aClass as:#stable.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   343
                ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   344
                checkinInfo tagIt ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   345
                    "set an additional tag for class that has been checked in"
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   346
                    self tagClass:aClass as:(checkinInfo tag).
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   347
                ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   348
            ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   349
        ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   350
        aborted ifTrue:[  |con|
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   351
            Transcript showCR:'Checkin of ''' , aClass name , ''' aborted'.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   352
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   353
            AbortAllOperationWantedQuery query ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   354
                (Dialog
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   355
                    confirm:(resources stringWithCRs:'Checkin of "%1" aborted.\\Cancel all ?' with:aClass name)
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   356
                    default:false)
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   357
                ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   358
                    AbortAllOperationRequest raise.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   359
                ]
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   360
            ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   361
            ^ false.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   362
        ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   363
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   364
    ^ true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   365
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   366
    "Created: / 21-12-2011 / 18:19:14 / cg"
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   367
!
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   368
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   369
defineSourceContainerForClass:aClass usingManager:mgr title:title text:boxText createDirectories:createDirs createContainer:createContainer
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   370
    "let user specify the source-repository values for aClass"
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   371
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   372
    |className
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   373
     "oldModule oldPackage" oldFileName
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   374
     module directory fileName nameSpace nameSpacePrefix
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   375
     info project nm creatingNew msg
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   376
     answer doCheckinWithoutAsking forceCheckIn rslt note
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   377
     requiredPackage projectDefinitionClass packageId|
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   378
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   379
    mgr isNil ifTrue:[^  false].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   380
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   381
    aClass isLoaded ifFalse:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   382
        self warn:(resources string:'Please load the %1-class first' with:aClass name).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   383
        ^ false.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   384
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   385
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   386
    className := aClass name.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   387
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   388
    aClass isProjectDefinition ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   389
        "/ no way - their package is already known and fix.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   390
        module := aClass module.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   391
        directory := aClass moduleDirectory.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   392
    ] ifFalse:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   393
        "/
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   394
        "/ defaults, if nothing at all is known
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   395
        "/
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   396
        projectDefinitionClass := aClass projectDefinitionClass.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   397
        projectDefinitionClass notNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   398
            packageId := PackageId from:projectDefinitionClass package.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   399
            module := packageId module.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   400
            directory := packageId directory.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   401
        ] ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   402
            (module := LastModule) isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   403
                module := (OperatingSystem getLoginName).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   404
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   405
            (directory := LastPackage) isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   406
                directory := 'private'.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   407
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   408
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   409
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   410
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   411
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   412
    "/ try to extract some useful defaults from the current project
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   413
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   414
    (Project notNil and:[(project := Project current) notNil]) ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   415
        directory isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   416
            (nm := project repositoryDirectory) isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   417
                nm := project name
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   418
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   419
            directory := nm.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   420
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   421
        module isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   422
            (nm := project repositoryModule) notNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   423
                module := nm
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   424
            ]
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   425
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   426
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   427
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   428
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   429
    "/ ask the sourceCodeManager if it knows anything about that class
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   430
    "/ if so, take that as a default.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   431
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   432
    info := mgr sourceInfoOfClass:aClass.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   433
    info notNil ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   434
        true "module ~= LastModule" ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   435
            (info includesKey:#module) ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   436
                module := (info at:#module).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   437
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   438
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   439
"/        true "package ~= LastPackage" ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   440
"/            (info includesKey:#directory) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   441
"/                package := (info at:#directory).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   442
"/            ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   443
"/        ].
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   444
        fileName := mgr containerFromSourceInfo:info.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   445
        (nameSpace := aClass nameSpace) ~~ Smalltalk ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   446
            nameSpacePrefix := nameSpace name , '::'.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   447
            (fileName startsWith:nameSpacePrefix) ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   448
                fileName := fileName copyFrom:(nameSpacePrefix size + 1).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   449
            ]
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   450
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   451
"/        (info includesKey:#fileName) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   452
"/            fileName := (info at:#fileName).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   453
"/        ] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   454
"/            (info includesKey:#expectedFileName) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   455
"/                fileName := (info at:#expectedFileName).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   456
"/            ] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   457
"/                (info includesKey:#classFileNameBase) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   458
"/                    fileName := (info at:#classFileNameBase) , '.st'.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   459
"/                ]
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   460
"/            ]
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   461
"/        ]
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   462
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   463
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   464
    fileName isNil ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   465
        fileName := (Smalltalk fileNameForClass:aClass) , '.st'.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   466
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   467
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   468
    OperatingSystem isMSDOSlike ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   469
        module replaceAll:$\ with:$/.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   470
        directory replaceAll:$\ with:$/.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   471
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   472
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   473
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   474
    "/ check for conflicts (i.e. if such a container already exists) ...
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   475
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   476
    doCheckinWithoutAsking := false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   477
"/false ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   478
"/    (mgr checkForExistingContainer:fileName inModule:module directory:directory) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   479
"/        answer := Dialog confirmWithCancel:(resources
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   480
"/                            string:'About to change the source container.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   481
"/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   482
"/Notice: there is a container for %1 in:
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   483
"/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   484
"/    %2 / %3 / %4
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   485
"/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   486
"/Do you want to change it or check right into that container ?'
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   487
"/                            with:className
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   488
"/                            with:module
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   489
"/                            with:directory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   490
"/                            with:fileName)
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   491
"/                labels:(resources array:#('Cancel' 'Check in' 'Change')).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   492
"/        answer isNil ifTrue:[AbortSignal raise].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   493
"/        answer ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   494
"/            doCheckinWithoutAsking := false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   495
"/            oldModule := module.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   496
"/            oldPackage := directory.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   497
"/            oldFileName := fileName
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   498
"/        ] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   499
"/            doCheckinWithoutAsking := true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   500
"/            creatingNew := false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   501
"/        ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   502
"/    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   503
"/].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   504
    mgr isContainerBased ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   505
        doCheckinWithoutAsking ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   506
            "/
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   507
            "/ open a dialog for this
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   508
            "/
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   509
            (mgr checkForExistingContainer:fileName inModule:module directory:directory) ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   510
                note := 'Notice: class seems to have no container yet.'.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   511
                creatingNew := true.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   512
            ] ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   513
                creatingNew := false.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   514
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   515
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   516
            rslt := self
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   517
                    askForContainer:boxText title:title note:note
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   518
                    initialModule:module initialPackage:directory initialFileName:fileName
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   519
                    forNewContainer:true.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   520
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   521
            rslt isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   522
                ^ false
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   523
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   524
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   525
            module := rslt at:#module.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   526
            directory := rslt at:#package.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   527
            fileName := rslt at:#fileName.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   528
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   529
        (fileName endsWith:',v') ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   530
            fileName := fileName copyButLast:2
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   531
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   532
        (fileName endsWith:'.st') ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   533
            fileName := fileName , '.st'
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   534
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   535
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   536
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   537
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   538
    "/ we require the packageID to be <module>:<container-dir>
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   539
    "/ check for this ...
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   540
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   541
    requiredPackage := ((module ? '') , ':' , (directory ? '')) asSymbol.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   542
    requiredPackage ~= aClass package ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   543
"/        doCheckinWithoutAsking ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   544
"/            (self confirm:'Change the classes packageID to: ''', requiredPackage , ''' ?')
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   545
"/            ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   546
"/                ^ false
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   547
"/            ]
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   548
"/        ].
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   549
        aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   550
        aClass package:requiredPackage.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   551
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   552
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   553
    info := aClass revisionInfo.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   554
    info notNil ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   555
        (info repositoryPathName isNil) ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   556
            info := nil
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   557
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   558
"/        (info includesKey:#repositoryPathName) ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   559
"/            info := nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   560
"/        ]
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   561
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   562
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   563
    info isNil ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   564
        true "doCheckinWithoutAsking" ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   565
            answer := Dialog
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   566
                 confirmWithCancel:(resources string:'%1 does not have any (usable) revision info (#version method)\\Shall I create one ?' with:className) withCRs
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   567
                 labels:(resources array:#( 'Cancel' 'No' 'Yes')).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   568
            answer isNil ifTrue:[^ false].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   569
        ] ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   570
            answer := true.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   571
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   572
        answer ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   573
            mgr
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   574
                updateVersionMethodOf:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   575
                for:(mgr initialRevisionStringFor:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   576
                         inModule:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   577
                         directory:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   578
                         container:fileName).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   579
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   580
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   581
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   582
    (self checkForExistingModule:module usingManager:mgr allowCreate:(createDirs or:[creatingNew]))
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   583
        ifFalse:[^ false].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   584
    LastModule := module.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   585
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   586
    (self checkForExistingModule:module directory:directory usingManager:mgr allowCreate:(createDirs or:[creatingNew]))
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   587
        ifFalse:[^ false].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   588
    LastPackage := directory.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   589
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   590
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   591
    "/ check for the container itself
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   592
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   593
    (mgr isContainerBased not
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   594
    or:[ mgr checkForExistingContainer:fileName inModule:module directory:directory ]) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   595
"/            (oldModule notNil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   596
"/            and:[(oldModule ~= module)
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   597
"/                 or:[oldPackage ~= package
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   598
"/                 or:[oldFileName ~= fileName]]])
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   599
"/            ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   600
"/                self warn:(resources string:'no change').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   601
"/                ^ false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   602
"/            ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   603
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   604
        mgr isContainerBased ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   605
            creatingNew ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   606
                self warn:(resources string:'Container for %1 already exists in %2/%3.' with:fileName with:module with:directory) withCRs.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   607
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   608
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   609
            doCheckinWithoutAsking ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   610
                (Dialog
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   611
                    confirm:(resources string:'check %1 into the existing container
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   612
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   613
    %2 / %3 / %4  ?'
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   614
                                    with:className
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   615
                                    with:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   616
                                    with:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   617
                                    with:fileName) withCRs
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   618
                    noLabel:'Cancel')
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   619
                ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   620
                    ^ false.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   621
                ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   622
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   623
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   624
        oldFileName notNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   625
            msg := ('forced checkin / source container change from ' , oldFileName).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   626
        ] ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   627
            msg := 'defined source container'
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   628
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   629
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   630
        (forceCheckIn := doCheckinWithoutAsking) ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   631
            (mgr
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   632
                checkinClass:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   633
                fileName:fileName
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   634
                directory:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   635
                module:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   636
                logMessage:msg)
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   637
            ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   638
                doCheckinWithoutAsking ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   639
                    (Dialog
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   640
                        confirm:'No easy merge seems possible; force checkin (no merge) ?'
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   641
                        noLabel:'Cancel')
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   642
                    ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   643
                        ^ false.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   644
                    ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   645
                ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   646
                forceCheckIn := true.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   647
            ]
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   648
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   649
        forceCheckIn ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   650
            (mgr
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   651
                checkinClass:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   652
                fileName:fileName
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   653
                directory:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   654
                module:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   655
                logMessage:msg
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   656
                force:true)
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   657
            ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   658
                self warn:(resources string:'Failed to check into existing container.').
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   659
                ^ false.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   660
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   661
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   662
        ^ true
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   663
    ] ifFalse:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   664
        (createContainer or:[creatingNew]) ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   665
            (Dialog
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   666
                 confirm:(resources string:'No container exists for %1 in %2/%3\\create ?'
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   667
                                      with:fileName with:module with:directory) withCRs
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   668
                 noLabel:'Cancel') ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   669
                ^ false
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   670
            ]
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   671
        ]
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   672
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   673
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   674
    aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   675
    aClass package:requiredPackage.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   676
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   677
    (mgr
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   678
        createContainerFor:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   679
        inModule:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   680
        package:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   681
        container:fileName
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   682
    ) ifFalse:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   683
        self warn:(resources string:'Failed to create container.').
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   684
        ^ false.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   685
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   686
    ^ true
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   687
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   688
    "Created: / 21-12-2011 / 18:34:02 / cg"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   689
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   690
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   691
!PerforceSourceCodeManagerUtilities methodsFor:'utilities-p4'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   692
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   693
submit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   694
    self defaultManager submit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   695
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   696
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   697
!PerforceSourceCodeManagerUtilities methodsFor:'utilities-p4-interaction'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   698
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   699
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswerOrNil withQuickOption:withQuickOption
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   700
    "ask for a log message for checking in a class (plus checkinQuick state info),
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   701
     and other info (mark as stable, for example).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   702
     Return the info-object (actually: the dialog) or nil if aborted."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   703
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   704
    |logMsg infoDialog|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   705
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   706
    infoDialog := self defaultManager checkInInfoDialogClass 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   707
                getCheckinInfoFor:aClassNameOrPackageNameString 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   708
                initialAnswer:(initialAnswerOrNil ? LastSourceLogMessage)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   709
                withQuickOption:withQuickOption.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   710
    infoDialog notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   711
        logMsg := infoDialog logMessage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   712
        logMsg notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   713
            LastSourceLogMessage := logMsg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   714
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   715
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   716
    ^ infoDialog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   717
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   718
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   719
     SourceCodeManagerUtilities getCheckinInfoFor:'hello' initialAnswer:'bla'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   720
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   721
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   722
    "Modified: / 06-07-2010 / 11:21:28 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   723
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   724
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   725
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog class methodsFor:'documentation'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   726
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   727
copyright
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   728
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   729
 COPYRIGHT (c) 2005 eXept Software AG
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   730
              All Rights Reserved
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   731
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   732
 This software is furnished under a license and may be used
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   733
 only in accordance with the terms of that license and with the
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   734
 inclusion of the above copyright notice.   This software may not
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   735
 be provided or otherwise made available to, or used by, any
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   736
 other person.  No title to or ownership of the software is
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   737
 hereby transferred.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   738
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   739
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   740
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   741
documentation
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   742
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   743
    checkin-dialog.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   744
    used to be private in SourceCodeManagerUtilites.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   745
    moved to libtool because libbasic3 should not contain code inheriting from GUI classes.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   746
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   747
    [author:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   748
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   749
    [see also:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   750
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   751
    [instance variables:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   752
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   753
    [class variables:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   754
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   755
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   756
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   757
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog class methodsFor:'interface specs'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   758
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   759
windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   760
    "This resource specification was automatically generated
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   761
     by the UIPainter of ST/X."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   762
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   763
    "Do not manually edit this!! If it is corrupted,
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   764
     the UIPainter may not be able to read the specification."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   765
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   766
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   767
     UIPainter new openOnClass:PerforceSourceCodeManager::P4CheckinInfoDialog andSelector:#windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   768
     PerforceSourceCodeManager::P4CheckinInfoDialog new openInterface:#windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   769
     PerforceSourceCodeManager::P4CheckinInfoDialog open
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   770
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   771
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   772
    <resource: #canvas>
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   773
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   774
    ^ 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   775
     #(FullSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   776
        name: windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   777
        window: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   778
       (WindowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   779
          label: 'Enter Log Message'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   780
          name: 'Enter Log Message'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   781
          min: (Point 10 10)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   782
          bounds: (Rectangle 0 0 800 327)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   783
        )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   784
        component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   785
       (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   786
          collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   787
           (HorizontalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   788
              name: 'HorizontalPanel2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   789
              layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   790
              horizontalLayout: left
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   791
              verticalLayout: center
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   792
              horizontalSpace: 0
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   793
              verticalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   794
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   795
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   796
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   797
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   798
                    label: 'Enter checkIn log-message for:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   799
                    name: 'Label1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   800
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   801
                    resizeForLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   802
                    useDefaultExtent: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   803
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   804
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   805
                    name: 'Label2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   806
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   807
                    labelChannel: descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   808
                    useDefaultExtent: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   809
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   810
                 )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   811
               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   812
              )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   813
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   814
           (TextEditorSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   815
              name: 'TextEditor1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   816
              layout: (LayoutFrame 2 0.0 38 0 -2 1 -125 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   817
              model: logMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   818
              hasHorizontalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   819
              hasVerticalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   820
              hasKeyboardFocusInitially: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   821
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   822
           (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   823
              name: 'Label4'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   824
              layout: (LayoutFrame 0 0.0 -119 1 0 1.0 -97 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   825
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   826
              labelChannel: warningMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   827
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   828
           (CheckBoxSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   829
              label: 'Quick Checkin (Only Classes in ChangeSet)'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   830
              name: 'CheckInChangedOnlyCheckbox'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   831
              layout: (LayoutFrame 3 0 -95 1 -3 0.5 -73 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   832
              visibilityChannel: quickCheckInVisibleHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   833
              model: quickCheckInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   834
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   835
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   836
           (CheckBoxSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   837
              label: 'Mark as Stable'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   838
              name: 'MarkStableCheckBox'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   839
              layout: (LayoutFrame 3 0 -68 1 -3 1 -46 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   840
              model: isStableHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   841
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   842
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   843
           (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   844
              label: 'Tag:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   845
              name: 'Label3'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   846
              layout: (LayoutFrame -40 0.5 -67 1 0 0.5 -45 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   847
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   848
              adjust: right
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   849
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   850
           (InputFieldSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   851
              name: 'TagEntryField'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   852
              layout: (LayoutFrame 0 0.5 -68 1 -3 1 -46 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   853
              enableChannel: tagItInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   854
              model: tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   855
              acceptOnReturn: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   856
              acceptOnTab: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   857
              acceptOnLostFocus: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   858
              acceptOnPointerLeave: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   859
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   860
           (HorizontalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   861
              name: 'ButtonPanel1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   862
              layout: (LayoutFrame 0 0.0 -40 1 0 1.0 0 1.0)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   863
              horizontalLayout: fitSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   864
              verticalLayout: center
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   865
              horizontalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   866
              verticalSpace: 2
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   867
              reverseOrderIfOKAtLeft: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   868
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   869
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   870
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   871
                 (ActionButtonSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   872
                    label: 'Cancel'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   873
                    name: 'Button2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   874
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   875
                    model: doCancel
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   876
                    extent: (Point 395 22)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   877
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   878
                 (ActionButtonSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   879
                    label: 'OK'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   880
                    name: 'Button1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   881
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   882
                    model: doAccept
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   883
                    extent: (Point 396 22)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   884
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   885
                 )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   886
               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   887
              )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   888
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   889
           (CheckBoxSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   890
              label: 'Immediate Submit'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   891
              name: 'CheckBox1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   892
              layout: (LayoutFrame 3 0.5 -95 1 -3 1 -73 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   893
              model: submitHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   894
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   895
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   896
           )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   897
         
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   898
        )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   899
      )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   900
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   901
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   902
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog class methodsFor:'opening'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   903
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   904
getCheckinInfoFor:aString initialAnswer:initialAnswer
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   905
    ^ self 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   906
        getCheckinInfoFor:aString 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   907
        initialAnswer:initialAnswer 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   908
        withQuickOption:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   909
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   910
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   911
      self getCheckinInfoFor:'hello' initialAnswer:'bla'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   912
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   913
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   914
    "Modified (format): / 12-03-2012 / 12:38:48 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   915
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   916
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   917
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   918
    ^ self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   919
        getCheckinInfoFor:aClassNameOrPackageNameString 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   920
        initialAnswer:initialAnswer 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   921
        withQuickOption:withQuickOption
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   922
        logHistory:#()
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   923
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   924
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   925
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   926
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   927
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   928
    "Modified: / 12-03-2012 / 12:39:00 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   929
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   930
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   931
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption logHistory:logHistoryArg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   932
    |dialog warnMessage|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   933
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   934
    warnMessage := nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   935
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   936
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   937
        dialog := self new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   938
        dialog 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   939
            description:aClassNameOrPackageNameString; 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   940
            logMessage:initialAnswer;
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   941
            withQuickOption:withQuickOption;
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   942
            logHistory:logHistoryArg.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   943
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   944
        dialog warningMessageHolder value:warnMessage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   945
        dialog open.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   946
        dialog accepted ifFalse:[ ^ nil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   947
    ] doUntil:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   948
        |stopAsking|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   949
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   950
        stopAsking := dialog allowEmptyLogMessage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   951
                      or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   952
        stopAsking ifFalse:[
16519
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
   953
            warnMessage := (self resources 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
   954
                                string:'Please enter a description of your changes!!') 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
   955
                                    withColor:Color red.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   956
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   957
        stopAsking
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   958
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   959
    ^ dialog    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   960
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   961
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   962
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   963
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   964
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   965
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   966
    "Created: / 12-03-2012 / 12:36:26 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   967
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   968
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   969
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog methodsFor:'accessing'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   970
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   971
allowEmptyLogMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   972
    ^ allowEmptyLogMessage ? false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   973
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   974
    "Created: / 06-07-2010 / 11:23:18 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   975
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   976
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   977
allowEmptyLogMessage:aBoolean 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   978
    allowEmptyLogMessage := aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   979
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   980
    "Created: / 06-07-2010 / 11:23:31 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   981
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   982
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   983
description
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   984
    ^ self descriptionHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   985
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   986
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   987
description:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   988
    self descriptionHolder value:aString allBold
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   989
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   990
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   991
isStable
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   992
    ^ self isStableHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   993
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   994
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   995
isStable:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   996
    self isStableHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   997
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   998
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   999
logHistory:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1000
    logHistory := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1001
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1002
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1003
logMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1004
    ^ self logMessageHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1005
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1006
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1007
logMessage:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1008
    self logMessageHolder value:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1009
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1010
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1011
quickCheckIn
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1012
    ^ self quickCheckInHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1013
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1014
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1015
quickCheckIn:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1016
    self quickCheckInHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1017
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1018
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1019
tag
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1020
    ^ self tagHolder value withoutSeparators
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1021
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1022
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1023
tag:aStringOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1024
    self tagHolder value:aStringOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1025
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1026
    "Modified: / 12-09-2006 / 12:03:50 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1027
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1028
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1029
tagIt
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1030
    ^ self tag notEmptyOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1031
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1032
    "Created: / 12-09-2006 / 13:06:49 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1033
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1034
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1035
withQuickOption:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1036
    ^ self quickCheckInVisibleHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1037
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1038
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1039
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog methodsFor:'aspects'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1040
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1041
descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1042
    descriptionHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1043
        descriptionHolder := ValueHolder new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1044
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1045
    ^ descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1046
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1047
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1048
isStableHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1049
    isStableHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1050
        isStableHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1051
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1052
    ^ isStableHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1053
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1054
    "Modified: / 16-01-2007 / 16:00:26 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1055
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1056
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1057
logHistoryHeadLineSelectionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1058
    logHistoryHeadLineSelectionHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1059
        logHistoryHeadLineSelectionHolder := nil asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1060
        logHistoryHeadLineSelectionHolder 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1061
            onChangeEvaluate:
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1062
                [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1063
                    self logMessageHolder value:(logHistory at:logHistoryHeadLineSelectionHolder value)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1064
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1065
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1066
    ^ logHistoryHeadLineSelectionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1067
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1068
    "Created: / 12-03-2012 / 12:40:36 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1069
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1070
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1071
logHistoryHeadLines
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1072
    ^ (logHistory ? #())
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1073
        collect:[:msg |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1074
            msg withoutLeadingSeparators asCollectionOfLines first , '...'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1075
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1076
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1077
    "Created: / 12-03-2012 / 12:39:35 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1078
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1079
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1080
logMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1081
    logMessageHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1082
        logMessageHolder := '' asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1083
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1084
    ^ logMessageHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1085
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1086
    "Modified: / 12-03-2012 / 12:34:13 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1087
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1088
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1089
quickCheckInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1090
    quickCheckInHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1091
        quickCheckInHolder := true asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1092
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1093
    ^ quickCheckInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1094
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1095
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1096
quickCheckInVisibleHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1097
    quickCheckInVisibleHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1098
        quickCheckInVisibleHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1099
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1100
    ^ quickCheckInVisibleHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1101
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1102
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1103
submitHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1104
    submitHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1105
        submitHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1106
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1107
    ^ submitHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1108
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1109
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1110
tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1111
    tagHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1112
        tagHolder := '' asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1113
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1114
    ^ tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1115
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1116
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1117
warningMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1118
    warningMessageHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1119
        warningMessageHolder := nil asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1120
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1121
    ^ warningMessageHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1122
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1123
    "Created: / 06-07-2010 / 11:30:29 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1124
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1125
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1126
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog class methodsFor:'documentation'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1127
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1128
copyright
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1129
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1130
 COPYRIGHT (c) 2005 eXept Software AG
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1131
              All Rights Reserved
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1132
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1133
 This software is furnished under a license and may be used
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1134
 only in accordance with the terms of that license and with the
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1135
 inclusion of the above copyright notice.   This software may not
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1136
 be provided or otherwise made available to, or used by, any
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1137
 other person.  No title to or ownership of the software is
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1138
 hereby transferred.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1139
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1140
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1141
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1142
documentation
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1143
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1144
    checkin-dialog.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1145
    used to be private in SourceCodeManagerUtilites.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1146
    moved to libtool because libbasic3 should not contain code inheriting from GUI classes.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1147
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1148
    [author:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1149
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1150
    [see also:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1151
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1152
    [instance variables:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1153
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1154
    [class variables:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1155
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1156
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1157
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1158
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog class methodsFor:'interface specs'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1159
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1160
windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1161
    "This resource specification was automatically generated
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1162
     by the UIPainter of ST/X."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1163
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1164
    "Do not manually edit this!! If it is corrupted,
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1165
     the UIPainter may not be able to read the specification."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1166
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1167
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1168
     UIPainter new openOnClass:PerforceSourceCodeManager::SubmitInfoDialog andSelector:#windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1169
     PerforceSourceCodeManager::SubmitInfoDialog new openInterface:#windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1170
     PerforceSourceCodeManager::SubmitInfoDialog open
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1171
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1172
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1173
    <resource: #canvas>
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1174
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1175
    ^ 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1176
     #(FullSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1177
        name: windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1178
        window: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1179
       (WindowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1180
          label: 'Enter Log Message'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1181
          name: 'Enter Log Message'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1182
          min: (Point 10 10)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1183
          bounds: (Rectangle 0 0 563 561)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1184
        )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1185
        component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1186
       (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1187
          collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1188
           (HorizontalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1189
              name: 'HorizontalPanel2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1190
              layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1191
              horizontalLayout: left
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1192
              verticalLayout: center
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1193
              horizontalSpace: 0
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1194
              verticalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1195
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1196
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1197
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1198
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1199
                    label: 'Enter checkIn log-message for:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1200
                    name: 'Label1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1201
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1202
                    resizeForLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1203
                    useDefaultExtent: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1204
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1205
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1206
                    name: 'Label2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1207
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1208
                    labelChannel: descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1209
                    useDefaultExtent: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1210
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1211
                 )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1212
               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1213
              )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1214
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1215
           (VerticalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1216
              name: 'VerticalPanel1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1217
              layout: (LayoutFrame 0 0.0 38 0 0 1.0 -80 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1218
              horizontalLayout: fit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1219
              verticalLayout: topFit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1220
              horizontalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1221
              verticalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1222
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1223
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1224
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1225
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1226
                    label: 'Files:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1227
                    name: 'Label4'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1228
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1229
                    adjust: left
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1230
                    extent: (Point 563 23)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1231
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1232
                 (TextEditorSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1233
                    name: 'TextEditor1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1234
                    enableChannel: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1235
                    model: filesHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1236
                    hasHorizontalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1237
                    hasVerticalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1238
                    hasKeyboardFocusInitially: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1239
                    extent: (Point 563 146)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1240
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1241
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1242
                    label: 'Log Message:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1243
                    name: 'Label5'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1244
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1245
                    adjust: left
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1246
                    extent: (Point 563 23)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1247
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1248
                 (TextEditorSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1249
                    name: 'TextEditor2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1250
                    model: logMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1251
                    hasHorizontalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1252
                    hasVerticalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1253
                    hasKeyboardFocusInitially: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1254
                    extent: (Point 563 242)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1255
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1256
                 )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1257
               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1258
              )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1259
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1260
           (CheckBoxSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1261
              label: 'Mark as Stable'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1262
              name: 'MarkStableCheckBox'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1263
              layout: (LayoutFrame 3 0 -68 1 -3 1 -46 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1264
              model: isStableHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1265
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1266
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1267
           (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1268
              label: 'Tag:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1269
              name: 'Label3'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1270
              layout: (LayoutFrame -40 0.5 -67 1 0 0.5 -45 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1271
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1272
              adjust: right
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1273
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1274
           (InputFieldSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1275
              name: 'TagEntryField'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1276
              layout: (LayoutFrame 0 0.5 -68 1 -3 1 -46 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1277
              enableChannel: tagItInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1278
              model: tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1279
              acceptOnReturn: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1280
              acceptOnTab: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1281
              acceptOnLostFocus: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1282
              acceptOnPointerLeave: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1283
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1284
           (HorizontalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1285
              name: 'ButtonPanel1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1286
              layout: (LayoutFrame 0 0.0 -40 1 0 1.0 0 1.0)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1287
              horizontalLayout: fitSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1288
              verticalLayout: center
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1289
              horizontalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1290
              verticalSpace: 2
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1291
              reverseOrderIfOKAtLeft: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1292
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1293
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1294
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1295
                 (ActionButtonSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1296
                    label: 'Cancel'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1297
                    name: 'Button2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1298
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1299
                    model: doCancel
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1300
                    extent: (Point 277 22)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1301
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1302
                 (ActionButtonSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1303
                    label: 'OK'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1304
                    name: 'Button1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1305
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1306
                    model: doAccept
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1307
                    extent: (Point 277 22)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1308
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1309
                 )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1310
               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1311
              )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1312
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1313
           )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1314
         
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1315
        )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1316
      )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1317
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1318
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1319
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog class methodsFor:'opening'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1320
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1321
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withFileList:fileList
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1322
    |dialog warnMessage|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1323
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1324
    warnMessage := nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1325
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1326
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1327
        dialog := self new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1328
        dialog 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1329
            description:aClassNameOrPackageNameString; 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1330
            logMessage:initialAnswer;
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1331
            files:fileList.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1332
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1333
        dialog warningMessageHolder value:warnMessage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1334
        dialog open.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1335
        dialog accepted ifFalse:[ ^ nil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1336
    ] doUntil:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1337
        |stopAsking|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1338
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1339
        stopAsking := dialog allowEmptyLogMessage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1340
                      or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1341
        stopAsking ifFalse:[
16519
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1342
            warnMessage := (self resources 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1343
                                string:'Please enter a description of your changes!!') 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1344
                                    withColor:Color red.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1345
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1346
        stopAsking
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1347
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1348
    ^ dialog    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1349
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1350
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1351
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1352
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1353
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1354
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1355
    "Modified: / 06-07-2010 / 11:40:00 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1356
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1357
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1358
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1359
    |dialog warnMessage|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1360
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1361
    warnMessage := nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1362
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1363
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1364
        dialog := self new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1365
        dialog 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1366
            description:aClassNameOrPackageNameString; 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1367
            logMessage:initialAnswer;
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1368
            withQuickOption:withQuickOption.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1369
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1370
        dialog warningMessageHolder value:warnMessage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1371
        dialog open.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1372
        dialog accepted ifFalse:[ ^ nil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1373
    ] doUntil:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1374
        |stopAsking|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1375
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1376
        stopAsking := dialog allowEmptyLogMessage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1377
                      or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1378
        stopAsking ifFalse:[
16519
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1379
            warnMessage := (self resources 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1380
                                string:'Please enter a description of your changes!!') 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1381
                                    withColor:Color red.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1382
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1383
        stopAsking
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1384
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1385
    ^ dialog    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1386
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1387
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1388
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1389
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1390
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1391
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1392
    "Modified: / 06-07-2010 / 11:40:00 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1393
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1394
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1395
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog methodsFor:'accessing'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1396
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1397
allowEmptyLogMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1398
    ^ allowEmptyLogMessage ? false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1399
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1400
    "Created: / 06-07-2010 / 11:23:18 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1401
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1402
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1403
allowEmptyLogMessage:aBoolean 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1404
    allowEmptyLogMessage := aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1405
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1406
    "Created: / 06-07-2010 / 11:23:31 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1407
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1408
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1409
description
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1410
    ^ self descriptionHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1411
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1412
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1413
description:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1414
    self descriptionHolder value:aString allBold
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1415
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1416
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1417
files
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1418
    ^ self filesHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1419
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1420
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1421
files:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1422
    self filesHolder value:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1423
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1424
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1425
isStable
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1426
    ^ self isStableHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1427
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1428
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1429
isStable:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1430
    self isStableHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1431
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1432
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1433
logMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1434
    ^ self logMessageHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1435
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1436
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1437
logMessage:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1438
    self logMessageHolder value:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1439
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1440
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1441
quickCheckIn
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1442
    ^ self quickCheckInHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1443
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1444
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1445
quickCheckIn:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1446
    self quickCheckInHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1447
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1448
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1449
tag
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1450
    ^ self tagHolder value withoutSeparators
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1451
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1452
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1453
tag:aStringOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1454
    self tagHolder value:aStringOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1455
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1456
    "Modified: / 12-09-2006 / 12:03:50 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1457
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1458
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1459
tagIt
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1460
    ^ self tag notEmptyOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1461
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1462
    "Created: / 12-09-2006 / 13:06:49 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1463
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1464
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1465
withQuickOption:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1466
    ^ self quickCheckInVisibleHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1467
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1468
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1469
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog methodsFor:'aspects'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1470
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1471
descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1472
    descriptionHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1473
        descriptionHolder := ValueHolder new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1474
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1475
    ^ descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1476
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1477
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1478
filesHolder
16183
d2dc8f201639 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 16059
diff changeset
  1479
    "automatically generated by UIPainter ..."
d2dc8f201639 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 16059
diff changeset
  1480
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1481
    <resource: #uiAspect>
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1482
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1483
    filesHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1484
        filesHolder := '' asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1485
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1486
    ^ filesHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1487
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1488
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1489
isStableHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1490
    isStableHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1491
        isStableHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1492
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1493
    ^ isStableHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1494
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1495
    "Modified: / 16-01-2007 / 16:00:26 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1496
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1497
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1498
logMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1499
    logMessageHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1500
        logMessageHolder := LastSourceLogMessage asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1501
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1502
    ^ logMessageHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1503
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1504
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1505
quickCheckInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1506
    quickCheckInHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1507
        quickCheckInHolder := true asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1508
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1509
    ^ quickCheckInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1510
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1511
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1512
quickCheckInVisibleHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1513
    quickCheckInVisibleHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1514
        quickCheckInVisibleHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1515
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1516
    ^ quickCheckInVisibleHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1517
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1518
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1519
tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1520
    tagHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1521
        tagHolder := '' asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1522
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1523
    ^ tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1524
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1525
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1526
tagItInHolder
16183
d2dc8f201639 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 16059
diff changeset
  1527
    "automatically generated by UIPainter ..."
d2dc8f201639 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 16059
diff changeset
  1528
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1529
    <resource: #uiAspect>
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1530
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1531
    tagItInHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1532
        tagItInHolder := true asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1533
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1534
    ^ tagItInHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1535
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1536
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1537
warningMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1538
    warningMessageHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1539
        warningMessageHolder := nil asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1540
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1541
    ^ warningMessageHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1542
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1543
    "Created: / 06-07-2010 / 11:30:29 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1544
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1545
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1546
!PerforceSourceCodeManagerUtilities::WorkSpace class methodsFor:'instance creation'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1547
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1548
newWorkSpaceFor:aSettingsString  
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1549
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1550
        get the workspace definition from perforce client command output
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1551
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1552
    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1553
    |workSpace|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1554
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1555
    aSettingsString isEmptyOrNil ifTrue:[ ^nil].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1556
    workSpace := self new initialize.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1557
    ^ workSpace newWorkSpaceFor:aSettingsString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1558
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1559
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1560
newWorkSpaceForSettings:settingsDict
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1561
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1562
        get the workspace definition from perforce client command output"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1563
    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1564
    |workSpace|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1565
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1566
    workSpace := self new initialize.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1567
    ^ workSpace newWorkSpaceForSettings:settingsDict
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1568
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1569
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1570
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'accessing'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1571
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1572
client
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1573
    ^ client
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1574
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1575
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1576
client:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1577
    client := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1578
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1579
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1580
host
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1581
    ^ host
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1582
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1583
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1584
host:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1585
    host := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1586
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1587
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1588
owner
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1589
    ^ owner
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1590
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1591
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1592
owner:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1593
    owner := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1594
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1595
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1596
perforceSettings
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1597
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1598
    perforceSettings isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1599
        perforceSettings := Dictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1600
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1601
    ^ perforceSettings
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1602
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1603
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1604
perforceSettings:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1605
    perforceSettings := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1606
    self owner:(perforceSettings at:#user ifAbsent:nil).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1607
    self client:(perforceSettings at:#client ifAbsent:nil).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1608
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1609
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1610
root
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1611
    ^ root
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1612
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1613
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1614
root:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1615
    root := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1616
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1617
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1618
tempDirectory
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1619
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1620
    tempDirectory isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1621
        tempDirectory := PerforceSourceCodeManager createTempDirectory:nil forModule:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1622
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1623
    ^ tempDirectory
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1624
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1625
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1626
temporaryWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1627
    ^ temporaryWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1628
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1629
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1630
views
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1631
    views isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1632
        views := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1633
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1634
    ^ views
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1635
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1636
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1637
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'actions'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1638
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1639
addCheckIn:checkInDefinition submit:doSubmit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1640
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1641
    | packagePath fullFilename s perforceCommand outputStream errorStream result tmpFilename binRevision newRevisionString number|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1642
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1643
    " create container for class initial check in"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1644
    checkInDefinition isClassCheckin ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1645
        binRevision := checkInDefinition getBinaryRevisionNumber.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1646
        (binRevision notNil and:[binRevision ~= 0]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1647
            (Dialog confirm:('Someone seems to have removed the source container for ',checkInDefinition definitionObjectString,'\\Force new checkin ?') withCRs) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1648
                checkInDefinition definitionClass setBinaryRevision:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1649
            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1650
                ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1651
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1652
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1653
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1654
    "initial checkin here"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1655
    self activityNotification:'adding ' , checkInDefinition definitionObjectString , ' to perforce repository...'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1656
    self getTemporaryWorkspaceFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1657
    self temporaryWorkSpace isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1658
        self perforceError raiseErrorString:('Error getting temporary workspace when adding ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1659
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1660
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1661
    number := self getChangeListNumber.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1662
    number isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1663
        self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1664
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1665
    ].
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1666
    packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1667
    fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1668
    tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1669
    tmpFilename directory recursiveMakeDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1670
    s := tmpFilename writeStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1671
    checkInDefinition isClassCheckin ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1672
        newRevisionString := self initialRevisionStringFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1673
        PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses) 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1674
            of:checkInDefinition definitionClass 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1675
            for:newRevisionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1676
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1677
    checkInDefinition isClassCheckin ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1678
        PerforceSourceCodeManager fileOutSourceCodeOf:checkInDefinition definitionClass on:s.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1679
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1680
        s nextPutAll:checkInDefinition fileContents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1681
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1682
    s close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1683
    perforceCommand := ('add  -t +ko -c ' , number printString, ' "', tmpFilename pathName, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1684
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1685
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1686
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1687
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1688
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1689
        logHeader:('adding ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1690
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1691
        checkInDefinition isClassCheckin ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1692
            Class withoutUpdatingChangesDo:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1693
                checkInDefinition definitionClass class removeSelector:PerforceSourceCodeManager nameOfVersionMethodInClasses    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1694
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1695
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1696
        ^ false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1697
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1698
    result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1699
    doSubmit ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1700
        result := self submitChangeNumber:number printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1701
        checkInDefinition isClassCheckin ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1702
            " checkout in real workspace "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1703
            perforceCommand := ('sync ' , number printString, ' "', fullFilename pathName, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1704
            outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1705
            errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1706
            result := self executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1707
                inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1708
                errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1709
                logHeader:('sync in my workspace ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1710
            result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1711
                ^ false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1712
            ].        
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1713
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1714
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1715
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1716
    self activityNotification:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1717
    ^result
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1718
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1719
    "Modified: / 28-06-2016 / 07:55:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1720
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1721
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1722
askForMergedSource:mergedSource 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1723
    localSource:mySource 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1724
    changesDict:changesDict 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1725
    haveRevision:haveRevision 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1726
    changesAsLogged:changesAsLogged 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1727
    pathName:pathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1728
    definitionClass:definitionClass
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1729
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1730
    |msg answer checkInRepaired emphasizedText emSep diffTextComment didAccept editor repairedText resultSource|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1731
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1732
    (changesDict notNil and:[(changesDict at:#conflicting) > 0]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1733
        "ooops must resolve conflicts"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1734
        msg := self messageForConflictsInClass:definitionClass revision:haveRevision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1735
        answer := self checkinTroubleDialog:'Version conflict'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1736
             message:msg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1737
             log:changesAsLogged
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1738
             abortable:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1739
             option:'show conflicts'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1740
             option2:'resolve conflicts'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1741
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1742
        answer == #option ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1743
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1744
            "/ show conflicts in a 3-way DiffTextView ...
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1745
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1746
            Diff3TextView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1747
                openOnMergedText:mergedSource
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1748
                label:'your version (checkin attempt)'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1749
                label:'original (base version)'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1750
                label:'newest repository version'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1751
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1752
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1753
        checkInRepaired := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1754
        answer == #option2 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1755
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1756
            "/ allow checkin of repair version
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1757
            "/ this is error prone ...
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1758
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1759
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1760
            "/ show merged version in an editor ...
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1761
            "/ ... accept will check it in.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1762
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1763
            emphasizedText := mergedSource asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1764
            emSep := (Array with:(#color->Color black) with:(#backgroundColor->Color green)).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1765
            emphasizedText := Diff3TextView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1766
                        emphasizeMergedDiff3TextFromPerforce:emphasizedText
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1767
                        origEmphasis:(Array with:(#color->Color black) with:(#backgroundColor->Color yellow))
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1768
                        otherEmphasis:(Array with:(#color->Color white) with:(#backgroundColor->Color red))
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1769
                        yourEmphasis:(Array with:(#color->Color white) with:(#backgroundColor->Color red))
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1770
                        separatorEmphasis:emSep.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1771
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1772
            diffTextComment := self diffTextComment.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1773
            diffTextComment := (Text string:diffTextComment emphasis:emSep) asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1774
            emphasizedText := diffTextComment , emphasizedText.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1775
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1776
            didAccept := false. checkInRepaired := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1777
            [didAccept not and:[checkInRepaired]] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1778
                editor := RCSConflictEditTextView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1779
                            setupWith:emphasizedText
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1780
                            title:'Resolve conflicts in ' , pathName asFilename baseName , ', then accept & close to checkin'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1781
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1782
                editor acceptAction:[:dummy |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1783
                    repairedText := editor list.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1784
                    didAccept := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1785
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1786
                didAccept := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1787
                editor topView openModal.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1788
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1789
                didAccept ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1790
                    (Dialog confirm:'You did not accept the new text. Edit again ?')
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1791
                    ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1792
                        checkInRepaired := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1793
                    ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1794
                ] ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1795
                    "/ check if all green-stuff (separators) have been removed
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1796
                    (repairedText findFirst:[:line | line notNil and:[line notEmpty and:[(line emphasisAt:1) = emSep]]]) ~~ 0 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1797
                        self warn:'You have to look at ALL conflicts, and remove ALL green lines as a confirmation !!'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1798
                        didAccept := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1799
                    ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1800
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1801
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1802
            resultSource := repairedText asString string.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1803
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1804
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1805
        checkInRepaired ifTrue:[
16954
5e6f9500fc12 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 16876
diff changeset
  1806
            Transcript showCR:'PerforceSourceCodeManager [info]: checking in ' , pathName asFilename baseName , ' (manually repaired version) ...'
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1807
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1808
            'PerforceSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1809
            Transcript showCR:'checkin of ' , pathName asFilename baseName , ' aborted (conflicting changes; repository unchanged)'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1810
            ^ nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1811
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1812
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1813
        mySource = mergedSource ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1814
            msg := self messageForNoChangesInClass:definitionClass.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1815
            self checkinTroubleDialog:'Merging versions'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1816
                           message:msg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1817
                           log:changesAsLogged
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1818
                           abortable:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1819
                           option:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1820
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1821
            msg := self messageForChangesInClass:definitionClass revision:haveRevision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1822
            answer := self checkinTroubleDialog:'Merging versions'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1823
                           message:msg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1824
                           log:changesAsLogged
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1825
                           abortable:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1826
                           option:'Stop - see first'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1827
            answer ~~ true ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1828
                answer == #option ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1829
                    DiffCodeView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1830
                        openOn:mySource
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1831
                        label:'current version'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1832
                        and:mergedSource
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1833
                        label:'merged version'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1834
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1835
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1836
                Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1837
                ^ nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1838
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1839
            resultSource := mergedSource.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1840
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1841
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1842
    ^ resultSource
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1843
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1844
    "Modified (format): / 01-06-2012 / 10:45:09 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1845
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1846
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1847
changeChangeDescriptionTo:logLines changeNumber:changeNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1848
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1849
    |perforceCommand outputStream errorStream changeListFile result changeFileContents changeListFileStream firstIndex oldLogFileLines writeNextLine newLogFileLines currentTokenLineParts currentToken|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1850
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1851
    self temporaryWorkSpace isNil ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1852
	self perforceError raiseErrorString:('Error getting temporary workspace when change the change description for ', changeNumber printString, '.').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1853
	^false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1854
    ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1855
    perforceCommand := 'change -o ', (changeNumber ? '').
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1856
    outputStream := ReadWriteStream on:''.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1857
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1858
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1859
			inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1860
			inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1861
			outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1862
			errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1863
			logHeader:('get change desription for change ', changeNumber printString, '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1864
    result ifFalse:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1865
	^ false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1866
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1867
    changeFileContents := outputStream contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1868
    changeFileContents isEmptyOrNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1869
	^false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1870
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1871
    changeListFile := self tempDirectory construct:'change'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1872
    changeListFileStream := changeListFile writeStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1873
    changeFileContents := changeFileContents asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1874
    firstIndex := changeFileContents indexOfLineStartingWith:'Description:'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1875
    firstIndex == 0 ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1876
	^false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1877
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1878
    oldLogFileLines := StringCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1879
    changeFileContents from:firstIndex do:[:aLine|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1880
	((aLine size > 1) and:[aLine first ~= $# and:[aLine first isSeparator not]]) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1881
	    currentTokenLineParts := aLine asCollectionOfSubstringsSeparatedBy:$:.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1882
	    currentTokenLineParts size > 1 ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1883
		currentToken := currentTokenLineParts first.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1884
	    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1885
	].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1886
	((aLine size > 1) and:[aLine first isSeparator and:[currentToken = 'Description']]) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1887
	    oldLogFileLines add:(aLine copyFrom:2).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1888
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1889
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1890
    newLogFileLines := StringCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1891
    changeNumber isNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1892
	newLogFileLines := logLines.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1893
    ] ifFalse:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1894
	(oldLogFileLines asString includesString:logLines asString) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1895
	    newLogFileLines := oldLogFileLines.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1896
	] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1897
	    newLogFileLines := oldLogFileLines.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1898
	    newLogFileLines addAll:logLines
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1899
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1900
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1901
    writeNextLine := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1902
    changeFileContents do:[:aLine|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1903
	writeNextLine ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1904
	    (aLine notEmpty and:[aLine first isSeparator not]) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1905
		writeNextLine := true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1906
	    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1907
	].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1908
	writeNextLine ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1909
	    (aLine startsWith:'Description:') ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1910
		changeListFileStream nextPutLine:aLine.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1911
		newLogFileLines do:[:logLine|
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1912
		    changeListFileStream nextPut:Character tab.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1913
		    changeListFileStream nextPutLine:logLine.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1914
		].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1915
		writeNextLine := false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1916
	    ] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1917
		changeListFileStream nextPutLine:aLine
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1918
	    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1919
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1920
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1921
    changeListFileStream close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1922
    perforceCommand := ('change -i < "', changeListFile pathName, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1923
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1924
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1925
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1926
			inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1927
			inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1928
			outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1929
			errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1930
			logHeader:('write change desription for change ', changeNumber printString, '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1931
    result ifFalse:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1932
	^false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1933
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1934
    ^ true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1935
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1936
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1937
checkForExistingContainer:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1938
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1939
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1940
    |perforceCommand outputStream errorStream result packagePath fullFilename depotPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1941
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1942
    packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1943
    fullFilename := packagePath construct:checkInDefinition packageDir.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1944
    depotPath := self getDepotPathForLocalPath:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1945
    perforceCommand := ('dirs "' ,depotPath , '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1946
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1947
    errorStream := ReadWriteStream on:''.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1948
    self getTemporaryWorkspaceFor:checkInDefinition.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1949
    self temporaryWorkSpace isNil ifTrue:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1950
        self perforceError raiseErrorString:('Error getting temporary workspace when check for existing container ', checkInDefinition definitionObjectString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1951
        ^false.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1952
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1953
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1954
        inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1955
        errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1956
        logHeader:('dirs in checkForExistingContainer for ', depotPath, '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1957
    result ifFalse:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1958
        ^ false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1959
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1960
    errorStream contents notEmpty ifTrue:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1961
        ^false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1962
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1963
    ^ true
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1964
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1965
    "Modified: / 28-06-2016 / 07:55:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1966
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1967
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1968
checkIn:checkInDefinition submit:doSubmit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1969
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1970
    | packagePath fullFilename s perforceCommand outputStream errorStream result tmpFilename fileNameAndRev tmpFilenameAndRev
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1971
      haveChange nextVersionMethod diffOutput number baseRevision cls newestInRepository newVersionString openChangeNumber|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1972
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1973
    self activityNotification:'checkin ' , checkInDefinition definitionObjectString , ' to perforce repository...'.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1974
    [
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1975
        cls := checkInDefinition definitionClass.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1976
        self getTemporaryWorkspaceFor:checkInDefinition.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1977
        self temporaryWorkSpace isNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1978
            self perforceError raiseErrorString:('Error getting temporary workspace when check in ', checkInDefinition definitionObjectString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1979
            ^false.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1980
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1981
        baseRevision := checkInDefinition getLocalRevisionNumber.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1982
        newestInRepository := checkInDefinition getReposRevisionNumberBeforeCheckin.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1983
        (checkInDefinition isClassCheckin and:[baseRevision isNil]) ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1984
            (Dialog confirm:('The version-info of ',checkInDefinition definitionObjectString allBold,' not exists. \Patch the version info?') withCRs)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1985
            ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1986
                newVersionString := self updatedRevisionStringOf:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1987
                                        forRevision:newestInRepository printString with:(cls revisionStringOfManager:PerforceSourceCodeManager).
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1988
                PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1989
                        of:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1990
                        for:newVersionString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1991
                baseRevision := checkInDefinition getLocalRevisionNumber.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1992
                baseRevision notNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1993
                        (Dialog confirm:('Check in ', checkInDefinition definitionObjectString allBold, 'based on version ', baseRevision printString, '?') withCRs)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1994
                        ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1995
                            ^false.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1996
                        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1997
                ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1998
            ] ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1999
                ^false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2000
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2001
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2002
        packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2003
        fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2004
        tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2005
        tmpFilename directory recursiveMakeDirectory.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2006
        checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2007
            baseRevision > newestInRepository ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2008
                openChangeNumber := self getOpenChangeFor:checkInDefinition.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2009
                openChangeNumber isNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2010
                    (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)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2011
                    ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2012
                        newVersionString := self updatedRevisionStringOf:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2013
                                                    forRevision:newestInRepository printString with:(cls revisionStringOfManager:PerforceSourceCodeManager).
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2014
                        PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2015
                            of:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2016
                            for:newVersionString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2017
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2018
                        cls updateVersionMethodFor:newVersionString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2019
                    ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2020
                ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2021
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2022
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2023
        checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2024
            fileNameAndRev := checkInDefinition fileName, '#', baseRevision printString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2025
        ] ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2026
            fileNameAndRev := checkInDefinition fileName, '#', newestInRepository printString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2027
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2028
        tmpFilenameAndRev := tmpFilename directory construct:fileNameAndRev.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2029
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2030
        openChangeNumber notNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2031
            s := tmpFilename writeStream.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2032
            checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2033
                PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2034
            ] ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2035
                s nextPutAll:checkInDefinition fileContents.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2036
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2037
            s close.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2038
            self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:openChangeNumber printString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2039
            doSubmit ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2040
                self submitChangeNumber:openChangeNumber printString
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2041
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2042
            ^true
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2043
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2044
        perforceCommand := ('revert "' , tmpFilename pathName, '"').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2045
        outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2046
        errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2047
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2048
            inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2049
            errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2050
            logHeader:('sync ', checkInDefinition definitionObjectString, ' to revision ', baseRevision printString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2051
        result ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2052
            ^ false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2053
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2054
        perforceCommand := ('sync -f "' , tmpFilenameAndRev pathName, '"').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2055
        outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2056
        errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2057
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2058
            inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2059
            errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2060
            logHeader:('sync ', checkInDefinition definitionObjectString, ' to revision ', baseRevision printString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2061
        result ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2062
            ^ false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2063
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2064
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2065
        number := self getChangeListNumber.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2066
        number isNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2067
            self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2068
            ^false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2069
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2070
        perforceCommand := ('edit -c ' ,number printString, ' "', tmpFilename pathName, '"').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2071
        outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2072
        errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2073
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2074
            inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2075
            errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2076
            logHeader:('edit ', checkInDefinition definitionObjectString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2077
        result ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2078
            ^ false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2079
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2080
        s := tmpFilename writeStream.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2081
        checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2082
            PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2083
        ] ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2084
            s nextPutAll:checkInDefinition fileContents.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2085
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2086
        s close.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2087
        perforceCommand := ('diff -db -dw -dl "' , tmpFilename pathName, '"').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2088
        outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2089
        errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2090
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2091
            inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2092
            errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2093
            logHeader:('diff ', checkInDefinition definitionObjectString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2094
        diffOutput := outputStream contents asStringCollection.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2095
        haveChange := diffOutput isEmptyOrNil or:[diffOutput notEmptyOrNil and:[diffOutput size > 1]].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2096
        haveChange ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2097
            self information:checkInDefinition definitionObjectString, ' not changed for revision ', baseRevision printString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2098
            newestInRepository ~= baseRevision ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2099
                newVersionString := self updatedRevisionStringOf:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2100
                                            forRevision:newestInRepository printString with:(cls revisionStringOfManager:PerforceSourceCodeManager).
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2101
                PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2102
                        of:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2103
                        for:newVersionString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2104
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2105
            perforceCommand := ('revert "' , tmpFilename pathName, '"').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2106
            outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2107
            errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2108
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2109
                inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2110
                errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2111
                logHeader:('revert ', checkInDefinition definitionObjectString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2112
            ^true
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2113
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2114
        checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2115
            nextVersionMethod := self nextRevisionStringFor:checkInDefinition.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2116
            nextVersionMethod isNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2117
                self perforceError raiseErrorString:('Cant get next version method string for ', checkInDefinition definitionObjectString, ' revision ', baseRevision printString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2118
                ^false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2119
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2120
            PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2121
                    of:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2122
                    for:nextVersionMethod.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2123
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2124
        result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2125
        doSubmit ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2126
            result := self submitChangeNumber:number printString
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2127
        ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2128
    ] ensure:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2129
        self activityNotification:''.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2130
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2131
    ^result
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2132
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2133
    "Modified: / 28-06-2016 / 07:55:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2134
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2135
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2136
createChange
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2137
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2138
    ^self changeChangeDescriptionTo:('' asStringCollection) changeNumber:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2139
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2140
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2141
createWorkSpaceClientSpecFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2142
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2143
    |ws myView|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2144
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2145
    ws := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2146
    ws nextPutAll:'Client: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2147
    ws nextPutAll:(self client).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2148
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2149
    ws nextPutAll:'Owner: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2150
    ws nextPutAll:(self owner).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2151
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2152
    ws nextPutAll:'Host: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2153
    ws nextPutAll:(self host).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2154
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2155
    ws nextPutAll:'Description: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2156
    ws nextPutAll:'Used temporary for Smalltalk/X'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2157
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2158
    ws nextPutAll:'Root: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2159
    ws nextPutAll:(self root asFilename pathName).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2160
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2161
    ws nextPutAll:'Options: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2162
    ws nextPutAll:'allwrite noclobber nocompress unlocked nomodtime normdir'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2163
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2164
    ws nextPutAll:'SubmitOptions: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2165
    ws nextPutAll:'submitunchanged'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2166
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2167
    ws nextPutAll:'LineEnd: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2168
    ws nextPutAll:'local'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2169
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2170
    ws nextPutAll:'View: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2171
    myView := checkInDefinition workSpace getViewForPackage:checkInDefinition package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2172
    ws nextPutAll:myView depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2173
    ws space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2174
    ws nextPutAll:'//', self client, '/...'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2175
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2176
    ws close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2177
    ^ws contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2178
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2179
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2180
delete:checkInDefinition submit:doSubmit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2181
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2182
    | packagePath fullFilename perforceCommand outputStream errorStream result tmpFilename number newestInRepository|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2183
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2184
    self activityNotification:'delete ' , checkInDefinition definitionObjectString , ' from perforce repository...'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2185
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2186
        newestInRepository := checkInDefinition getReposRevisionNumberBeforeCheckin.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2187
        newestInRepository isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2188
            self information:(checkInDefinition definitionObjectString, ' not exists in repository.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2189
            ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2190
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2191
        self getTemporaryWorkspaceFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2192
        self temporaryWorkSpace isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2193
            self perforceError raiseErrorString:('Error getting temporary workspace when check in ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2194
            ^false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2195
        ].
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2196
        packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2197
        fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2198
        tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2199
        tmpFilename directory recursiveMakeDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2200
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2201
        number := self getChangeListNumber.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2202
        number isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2203
            self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2204
            ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2205
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2206
        perforceCommand := ('delete -c ' ,number printString, ' "', tmpFilename pathName, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2207
        outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2208
        errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2209
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2210
            inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2211
            errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2212
            logHeader:('Error delete ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2213
        result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2214
            ^ false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2215
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2216
        result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2217
        doSubmit ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2218
            result := self submitChangeNumber:number printString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2219
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2220
    ] ensure:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2221
        self activityNotification:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2222
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2223
    ^result
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2224
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2225
    "Modified: / 28-06-2016 / 07:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2226
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2227
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2228
deleteWorkSpaceFromServer
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2229
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2230
    |perforceCommand outputStream errorStream result tmpWorkSpace|
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2231
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2232
    tmpWorkSpace := self temporaryWorkSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2233
    tmpWorkSpace isNil ifTrue:[ ^true].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2234
    perforceCommand := ('client -df ', client).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2235
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2236
    errorStream := ReadWriteStream on:''.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2237
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2238
	inputFrom:nil outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2239
	errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2240
	logHeader:('delete client ', client).
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2241
    result ifFalse:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2242
	^ false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2243
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2244
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2245
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2246
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2247
getChangeDespriptionInfoFor:changeNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2248
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2249
    |valuePairs startLineIndex keyEndIndex changeContents cmd outputStream errorStream result keyValues beginLine endLine keyName keyValue|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2250
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2251
    self temporaryWorkSpace isNil ifTrue:[
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2252
        self perforceError raiseErrorString:('Error getting temporary workspace when try to get change description for ', changeNumber printString, '.').
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2253
        ^nil.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2254
    ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2255
    valuePairs := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2256
    cmd := 'change -o ', (changeNumber ? '').
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2257
    outputStream := ReadWriteStream on:''.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2258
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2259
    result := self temporaryWorkSpace executePerforceCommand:cmd
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2260
                        inDirectory:self tempDirectory
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2261
                        inputFrom:nil
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2262
                        outputTo:outputStream
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2263
                        errorTo:errorStream
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2264
                        logHeader:('getting change description ', (changeNumber ? ''), '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2265
    result ifFalse:[
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2266
        ^ nil
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2267
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2268
    changeContents := outputStream contents asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2269
    changeContents doWithIndex:[:aLine :index|
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2270
        startLineIndex isNil ifTrue:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2271
            (aLine isEmpty or:[(aLine startsWith:$#) or:[aLine first isSeparator]]) ifFalse:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2272
                keyEndIndex := aLine indexOf:$:.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2273
                keyEndIndex ~~ 0 ifTrue:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2274
                    startLineIndex := index.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2275
                    valuePairs add:(Array with:index with:nil with:(aLine copyTo:keyEndIndex - 1)).
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2276
                ].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2277
            ].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2278
        ] ifFalse:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2279
            (aLine isEmpty or:[aLine startsWith:$#]) ifTrue:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2280
                valuePairs last at:2 put:index.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2281
                startLineIndex := nil.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2282
            ].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2283
        ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2284
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2285
    keyValues := Dictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2286
    valuePairs do:[:each|
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2287
        beginLine := each first.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2288
        endLine := each second.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2289
        keyName := each last.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2290
        (beginLine == (endLine - 1)) ifTrue:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2291
            keyValue := (changeContents at:beginLine) copyFrom:(keyName size + 2).
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2292
            keyValue := (keyValue withoutLeadingSeparators withoutTrailingSeparators) asStringCollection.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2293
        ] ifFalse:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2294
            keyValue := changeContents copyFrom:(beginLine + 1) to:(endLine - 1).
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2295
            keyValue := keyValue collect:[:each | each withoutLeadingSeparators withoutTrailingSeparators].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2296
        ].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2297
        keyValues at:keyName put:keyValue.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2298
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2299
    ^ keyValues.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2300
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2301
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2302
getChangeListNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2303
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2304
    |numbers|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2305
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2306
    numbers := self getCurrentChangeListNumbers.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2307
    numbers notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2308
        ^numbers first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2309
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2310
    self createChange ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2311
        numbers := self getCurrentChangeListNumbers.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2312
        numbers notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2313
            ^numbers first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2314
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2315
        
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2316
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2317
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2318
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2319
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2320
getCurrentChangeListNumbers
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2321
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2322
    |perforceCommand outputStream errorStream result pendingChangesOutput words numbers number|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2323
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2324
    self temporaryWorkSpace isNil ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2325
	self perforceError raiseErrorString:('Error getting temporary workspace when try to get change numbers.').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2326
	^nil.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2327
    ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2328
    perforceCommand := 'changes -s pending -u ', owner.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2329
    outputStream := ReadWriteStream on:''.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2330
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2331
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2332
			inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2333
			inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2334
			outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2335
			errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2336
			doLog:false.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2337
    result ifFalse:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2338
	^ nil
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2339
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2340
    numbers := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2341
    pendingChangesOutput := outputStream contents asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2342
    pendingChangesOutput do:[:eachLine|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2343
	words := eachLine asCollectionOfWords.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2344
	words size > 1 ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2345
	    number := Number readFrom:(ReadStream on:(words at:2)) onError:nil.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2346
	    numbers add:number.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2347
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2348
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2349
    ^numbers
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2350
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2351
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2352
getFileStatForPathname:aPathname
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2353
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2354
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2355
    |perforceCommand outputStream errorStream result fileStatDict endOfKeywordIndex keyWord keyValue|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2356
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2357
    perforceCommand := ('fstat  "' , aPathname, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2358
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2359
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2360
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2361
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2362
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2363
        logHeader:('getting file status from ', aPathname, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2364
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2365
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2366
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2367
    fileStatDict := Dictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2368
    outputStream contents asStringCollection do:[:aLine|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2369
        endOfKeywordIndex := aLine indexOfSeparatorStartingAt:5.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2370
        keyWord := aLine copyFrom:5 to:(endOfKeywordIndex - 1).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2371
        keyValue := aLine copyFrom:endOfKeywordIndex + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2372
        fileStatDict at:keyWord put:keyValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2373
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2374
    ^ fileStatDict
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2375
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2376
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2377
     | workSpace tempWorkSpace dict|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2378
    workSpace := PerforceSourceCodeManager getWorkSpaceForPackage:'applistx'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2379
    tempWorkSpace := workSpace temporaryWorkSpace.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2380
    dict := tempWorkSpace getFileStatForPathname:'C:\Dokumente und Einstellungen\gds2180\Lokale Einstellungen\Temp\stx_tmp\st6120368\applistx\util\libDataType\ActionLQualifier.st'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2381
    dict includesKey:'unresolved'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2382
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2383
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2384
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2385
getOpenChangeFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2386
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2387
    |numbers changeDescr files versionInfo|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2388
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2389
    numbers := self getCurrentChangeListNumbers.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2390
    numbers notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2391
        numbers do:[:changeNumber|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2392
            changeDescr := self getChangeDespriptionInfoFor:changeNumber printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2393
            files := changeDescr at:#Files ifAbsent:[nil].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2394
            files notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2395
                versionInfo := PerforceSourceCodeManager versionInfoClass fromRCSString:checkInDefinition getLocalRevisionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2396
                files do:[:aFileAndAction|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2397
                    (aFileAndAction startsWith:versionInfo repositoryPathName) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2398
                        ^changeNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2399
                    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2400
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2401
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2402
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2403
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2404
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2405
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2406
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2407
getTemporaryWorkspaceFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2408
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2409
        create an temporary workspace for handle checkin
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2410
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2411
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2412
    |workSpaceName workSpaceDefinitionFilename ws perforceCommand result readStream  directory 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2413
     settingsTemporary myView outputStream errorStream lineStream clientSpec index words|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2414
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2415
    directory := self tempDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2416
    workSpaceName := self temporaryClientName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2417
    perforceCommand := 'clients -u ' , (self perforceSettings at:#user).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2418
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2419
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2420
    result := self executePerforceCommand:perforceCommand
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2421
                        inDirectory:directory pathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2422
                        inputFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2423
                        outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2424
                        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2425
                        doLog:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2426
                        logHeader:('check for existing workspace client.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2427
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2428
        temporaryWorkSpace := nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2429
    ]. 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2430
    index := outputStream contents asStringCollection findFirst:[:aLine|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2431
        words := aLine asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2432
        words size > 1 and:[words second = workSpaceName]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2433
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2434
    index = 0 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2435
        temporaryWorkSpace := nil.   
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2436
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2437
    temporaryWorkSpace isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2438
        directory exists ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2439
            self perforceError raiseErrorString:('Perforce temporary workspace directory ', directory pathName, ' not exists.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2440
            ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2441
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2442
        settingsTemporary := self perforceSettings copy.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2443
        settingsTemporary at:#client put:workSpaceName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2444
        temporaryWorkSpace := self class newWorkSpaceForSettings:settingsTemporary.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2445
        temporaryWorkSpace root:directory asFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2446
        temporaryWorkSpace host:self host.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2447
        myView := self getViewForPackage:checkInDefinition package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2448
        lineStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2449
        lineStream nextPutAll:myView depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2450
        lineStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2451
        lineStream nextPutAll:'//', workSpaceName, '/...'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2452
        temporaryWorkSpace views add:(View newFromLine:lineStream contents workspace:temporaryWorkSpace).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2453
        workSpaceDefinitionFilename := directory asFilename construct:workSpaceName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2454
        clientSpec := temporaryWorkSpace createWorkSpaceClientSpecFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2455
        ws := workSpaceDefinitionFilename writeStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2456
        ws nextPutAll:clientSpec.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2457
        ws close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2458
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2459
        readStream := ReadStream on:clientSpec.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2460
        perforceCommand := 'client -i < "', workSpaceDefinitionFilename pathName, '"'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2461
        outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2462
        errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2463
        result := temporaryWorkSpace executePerforceCommand:perforceCommand
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2464
                            inDirectory:directory pathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2465
                            inputFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2466
                            outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2467
                            errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2468
                            doLog:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2469
                            logHeader:('writing temporary workspace definition.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2470
        result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2471
            temporaryWorkSpace := nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2472
        ]. 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2473
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2474
    ^temporaryWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2475
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2476
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2477
mergeOrResolveConflictsForChangeNumber:aNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2478
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2479
    | tmpFilename perforceCommand outputStream errorStream result s
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2480
      changesAsLogged inStream line changesDict chunksPart words mergedSource mySource
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2481
      localRevision resultSource definitionClass descriptionInfo resolveFiles depotPath localPath checkInDefinition fileStatDict|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2482
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2483
    self temporaryWorkSpace isNil ifTrue:[
16876
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2484
        self perforceError raiseErrorString:('Error getting temporary workspace when try to merge or resolve conflicts for ', aNumber printString, '.').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2485
        ^false.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2486
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2487
    descriptionInfo := (self getChangeDespriptionInfoFor:aNumber printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2488
    descriptionInfo isNil ifTrue:[
16876
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2489
        ^false.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2490
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2491
    resolveFiles := descriptionInfo at:#Files ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2492
    resolveFiles isNil ifTrue:[
16876
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2493
        ^false.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2494
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2495
    resolveFiles do:[:aFileLine|
16876
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2496
        depotPath := (aFileLine copyTo:((aFileLine lastIndexOf:$#) - 1 )) withoutTrailingSeparators.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2497
        localPath := self temporaryWorkSpace getLocalPathForDepotPath:depotPath.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2498
        fileStatDict := self temporaryWorkSpace getFileStatForPathname:localPath.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2499
        (fileStatDict includesKey:'unresolved') ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2500
            definitionClass := Smalltalk at:(localPath asFilename withoutSuffix baseName asSymbol) ifAbsent:nil.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2501
            checkInDefinition := PerforceSourceCodeManager getCheckInDefinitionForClass:definitionClass.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2502
            localRevision := checkInDefinition getLocalRevisionNumber.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2503
            tmpFilename := localPath asFilename.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2504
            perforceCommand := ('resolve -af  "' , tmpFilename pathName, '"').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2505
            outputStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2506
            errorStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2507
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2508
                inputFrom:nil outputTo:outputStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2509
                errorTo:errorStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2510
                logHeader:('resolving ', tmpFilename pathName, '.').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2511
            result ifFalse:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2512
                ^ false
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2513
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2514
            "check for conflicts"
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2515
            changesAsLogged := StringCollection new.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2516
            inStream := ReadStream on:(outputStream contents).
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2517
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2518
            [inStream atEnd not] whileTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2519
                line:= inStream nextLine.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2520
                line notNil ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2521
                    (line startsWith:'Diff chunks:') ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2522
                        changesAsLogged add:line.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2523
                        changesDict := Dictionary new.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2524
                        chunksPart := line copyFrom:('Diff chunks:' size + 1).
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2525
                        (chunksPart asCollectionOfSubstringsSeparatedBy:$+) do:[:eachElement|
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2526
                            words := eachElement asCollectionOfWords.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2527
                            changesDict at:words second asSymbol put:words first asNumber.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2528
                        ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2529
                    ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2530
                ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2531
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2532
            s := WriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2533
            PerforceSourceCodeManager fileOutSourceCodeOf:definitionClass on:s.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2534
            mergedSource := tmpFilename readStream contents asString.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2535
            mySource := s contents asString.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2536
            resultSource := self askForMergedSource:mergedSource
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2537
                    localSource:mySource
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2538
                    changesDict:changesDict
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2539
                    haveRevision:(fileStatDict at:'haveRev' ifAbsent:nil)
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2540
                    changesAsLogged:changesAsLogged
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2541
                    pathName:tmpFilename pathName
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2542
                    definitionClass:definitionClass.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2543
            resultSource isNil ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2544
                ^false.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2545
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2546
            "now we have a merge - lets get latest revision and write on it "
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2547
            perforceCommand := ('revert "' , tmpFilename pathName, '"').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2548
            outputStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2549
            errorStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2550
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2551
                inputFrom:nil outputTo:outputStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2552
                errorTo:errorStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2553
                logHeader:('revert after resolving ', tmpFilename pathName, '.').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2554
            result ifFalse:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2555
                ^ false
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2556
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2557
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2558
            tmpFilename remove.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2559
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2560
            perforceCommand := ('sync -f "' , tmpFilename pathName, '"').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2561
            outputStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2562
            errorStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2563
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2564
                inputFrom:nil outputTo:outputStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2565
                errorTo:errorStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2566
                logHeader:('sync after resolving ', tmpFilename pathName, '.').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2567
            result ifFalse:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2568
                ^ false
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2569
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2570
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2571
            perforceCommand := ('edit -c ', aNumber printString, ' "' , tmpFilename pathName, '"').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2572
            outputStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2573
            errorStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2574
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2575
                inputFrom:nil outputTo:outputStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2576
                errorTo:errorStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2577
                logHeader:('edit after resolving ', tmpFilename pathName, '.').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2578
            result ifFalse:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2579
                ^ false
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2580
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2581
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2582
            "write my result"
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2583
            resultSource notNil ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2584
                s := tmpFilename writeStream.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2585
                s nextPutAll:resultSource.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2586
                s close.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2587
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2588
        ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2589
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2590
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2591
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2592
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2593
releaseWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2594
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2595
    temporaryWorkSpace notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2596
        temporaryWorkSpace deleteWorkSpaceFromServer.   
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2597
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2598
    tempDirectory notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2599
        tempDirectory recursiveRemove.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2600
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2601
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2602
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2603
revisionLogOf:clsOrNil 
14665
9cc738d8e4e7 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14333
diff changeset
  2604
        fromRevision:firstRev toRevision:lastRef numberOfRevisions:numRevisions 
9cc738d8e4e7 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14333
diff changeset
  2605
        fileName:classFileName directory:packageDir module:aPackage
9cc738d8e4e7 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14333
diff changeset
  2606
9cc738d8e4e7 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14333
diff changeset
  2607
    "actually do return a revisionLog. The main worker method."
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2608
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2609
    |atEnd line inHeaderInfo info record revisionRecords headerOnly msg revArg infoAndLogString elements 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2610
     foundView outputStream errorStream inStream packagePath fullFilename depotPath perforceCommand result labelLineElements tags label revision|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2611
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2612
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2613
        revArg := ''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2614
        headerOnly := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2615
        (firstRev notNil or:[lastRef notNil]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2616
            (firstRev == 0 and:[lastRef == 0]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2617
                headerOnly := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2618
            ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2619
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2620
        foundView := self getViewForPackage:aPackage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2621
        headerOnly ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2622
            msg := 'fetching revision info '
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2623
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2624
            msg := 'reading revision log '
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2625
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2626
        clsOrNil isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2627
            foundView notNil ifTrue:[            
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2628
                msg := msg , 'in ', foundView local.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2629
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2630
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2631
            msg := msg , 'of ', clsOrNil name.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2632
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2633
        self activityNotification:msg,'...'.
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2634
        packagePath := Smalltalk getPackageDirectoryForPackage:aPackage.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2635
        fullFilename := (packagePath construct:packageDir) construct:classFileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2636
        depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2637
        perforceCommand := ('filelog "' , depotPath, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2638
        outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2639
        errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2640
        result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2641
            inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2642
            errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2643
            logHeader:('getting filelog ', depotPath, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2644
        result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2645
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2646
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2647
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2648
        "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2649
        "/ read the commands pipe output and extract the container info
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2650
        "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2651
        info := IdentityDictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2652
        inHeaderInfo := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2653
        revisionRecords := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2654
        info at:#revisions put:revisionRecords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2655
        inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2656
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2657
            line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2658
            line notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2659
                |gotIt|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2660
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2661
                gotIt := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2662
                infoAndLogString := line asCollectionOfSubstringsSeparatedBy:$'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2663
                elements := infoAndLogString size.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2664
                elements > 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2665
                    record := self readRevisionLogEntryFromString:line.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2666
                    ((record at:#state ifAbsent:'') = 'delete') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2667
                        info at:#newestRevision put:#deleted.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2668
                    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2669
                        info at:#newestRevision put:(record at:#revision).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2670
                    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2671
                    info at:#numberOfRevisions put:((record at:#revision) asNumber).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2672
                    revisionRecords add:record.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2673
                    inHeaderInfo := false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2674
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2675
            ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2676
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2677
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2678
        info isEmpty ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2679
            ('PerforceSourceCodeManager [warning]: no log for ', depotPath) errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2680
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2681
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2682
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2683
        "/ strip selected revisions from the total-revisions entry
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2684
        headerOnly ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2685
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2686
            "/ continue to read the commands pipe output
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2687
            "/ and extract revision info records
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2688
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2689
            atEnd := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2690
            [atEnd or:[inStream atEnd]] whileFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2691
                record := self readRevisionLogEntryFromStream:inStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2692
                record isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2693
                    atEnd := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2694
                ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2695
                    revisionRecords add:record.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2696
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2697
                (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2698
                    atEnd := true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2699
                ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2700
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2701
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2702
    ] ensure:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2703
        outputStream notNil ifTrue:[outputStream close].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2704
        self activityNotification:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2705
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2706
    perforceCommand := ('labels "' , depotPath, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2707
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2708
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2709
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2710
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2711
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2712
        logHeader:('getting labels ', depotPath, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2713
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2714
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2715
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2716
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2717
    tags := Dictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2718
    [inStream atEnd not] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2719
        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2720
        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2721
            labelLineElements := line asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2722
            elements := labelLineElements size.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2723
            elements > 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2724
                label := labelLineElements second withoutSeparators.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2725
                revision := self getRevisionForLabel:label depotPath:depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2726
                tags at:(labelLineElements second withoutSeparators) put:revision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2727
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2728
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2729
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2730
    info at:#symbolicNames put:tags.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2731
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2732
    ^ info
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2733
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2734
    "Modified: / 28-06-2016 / 07:54:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2735
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2736
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2737
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathsInRepository
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2738
    "set a symbolicName for revision rev.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2739
     If rev is nil, set it for the head (most recent) revision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2740
     If rev is 0, delete the symbolic name.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2741
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2742
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2743
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2744
     If filename is nil, the symbolicName for a whole package is set.
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2745
     If multiple paths are given, the revision MUST be nil."
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2746
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2747
    |argumentString result errorStream moduleDirs symbolicName perforceCommand outputStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2748
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2749
    symbolicName := (symbolicNameArg includes:Character space)
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2750
                        ifTrue:[ '"',symbolicNameArg,'"' ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2751
                        ifFalse:[ symbolicNameArg ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2752
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2753
    pathsInRepository size > 1 ifTrue:[
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2754
        self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple paths"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2755
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2756
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2757
    moduleDirs := pathsInRepository
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2758
                    collect:[:pathInRepository |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2759
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2760
                    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2761
    moduleDirs do:[:moduleDir |
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2762
        |pathsInModule pathsInModuleAsArgument|
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2763
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2764
        pathsInModule := pathsInRepository
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2765
                    select:[:pathInRepository |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2766
                        |moduleOfThisPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2767
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2768
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2769
                        moduleOfThisPath = moduleDir
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2770
                    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2771
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2772
        rev = 0 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2773
            argumentString := ' -d '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2774
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2775
            argumentString := ' -r ', (rev ? 'HEAD').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2776
            overWriteBool ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2777
                argumentString := argumentString, ' -F'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2778
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2779
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2780
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2781
        pathsInModuleAsArgument := pathsInModule
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2782
                                        collect:[:eachPath |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2783
                                            (eachPath includes:Character space) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2784
                                                '"',eachPath,'"'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2785
                                            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2786
                                                eachPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2787
                                            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2788
                                        ].
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2789
        pathsInModuleAsArgument := pathsInModuleAsArgument asStringCollection asStringWith:Character space.
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2790
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2791
        self activityNotification:'setting symbolic name for: ', pathsInModuleAsArgument.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2792
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2793
        self information:'Implementation not finished yet'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2794
        ^self.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2795
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2796
        perforceCommand := ('label "' , pathsInRepository, '"').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2797
        outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2798
        errorStream := ReadWriteStream on:''.
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2799
        result := self executePerforceCommand:perforceCommand inDirectory:self root
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2800
            inputFrom:nil outputTo:outputStream
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2801
            errorTo:errorStream
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2802
            logHeader:('set label ', pathsInRepository, '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2803
        result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2804
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2805
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2806
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2807
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2808
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2809
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2810
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2811
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2812
     self
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2813
        setSymbolicName:'test1'
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2814
        revision:nil
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2815
        overWrite:true
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2816
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2817
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2818
     self
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2819
        setSymbolicName:'test2'
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2820
        revision:nil
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2821
        overWrite:true
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2822
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2823
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2824
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2825
     self
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2826
        setSymbolicName:'test2'
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2827
        revision:0
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2828
        overWrite:true
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2829
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2830
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2831
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2832
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2833
    "Created: / 12-09-2006 / 12:36:44 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2834
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2835
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2836
streamFor:checkInDefinition revision:revision cache:doCache
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2837
    "extract a classes source code and return an open readStream on it.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2838
     A revision of nil selects the current (in image) revision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2839
     The classes source code is extracted using the revision and the sourceCodeInfo,
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2840
     which itself is extracted from the classes packageString."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2841
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2842
    |cacheIt cacheDir classFileName fullName cachedSourceFilename cacheSubDir cachedFile tempdir checkoutName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2843
     checkoutNameLocal revMsg fullTempName fullCachedName stream tempFile outStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2844
     line modulDir lineNr result outputStream errorStream inStream cls module packageDir packagePath fullFilename perforceCommand|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2845
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2846
    cacheIt := doCache.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2847
    (cacheIt and:[revision ~~ #newest and:[revision notNil]]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2848
        (cacheDir := PerforceSourceCodeManager sourceCacheDirectory) isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2849
            'PerforceSourceCodeManager [warning]: no source cache directory' errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2850
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2851
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2852
    self getTemporaryWorkspaceFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2853
    cls := checkInDefinition definitionClass.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2854
    classFileName := checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2855
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2856
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2857
    (classFileName endsWith:',v') ifTrue:[
12702
2759bbb8d06b Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 11959
diff changeset
  2858
        classFileName := classFileName copyButLast:2.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2859
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2860
    (classFileName endsWith:'.st') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2861
        cls notNil ifTrue:[
12702
2759bbb8d06b Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 11959
diff changeset
  2862
            classFileName := classFileName copyButLast:3.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2863
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2864
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2865
    module :=  checkInDefinition package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2866
    packageDir := checkInDefinition packageDir.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2867
    fullName := module , '/' , packageDir , '/' , classFileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2868
    cls notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2869
        fullName := fullName , '.st'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2870
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2871
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2872
    (revision isNil or:[revision == #newest]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2873
        cachedSourceFilename := classFileName, '_p4'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2874
        revMsg := ''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2875
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2876
        cachedSourceFilename := classFileName , '_p4_' , revision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2877
        revMsg := ' (' , revision , ')'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2878
    ].                                               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2879
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2880
    cacheDir notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2881
        cacheSubDir := cacheDir construct:module.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2882
        cacheSubDir := cacheSubDir construct:packageDir.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2883
        cachedFile := cacheSubDir construct:cachedSourceFilename.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2884
        cachedFile exists ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2885
            ^ cachedFile readStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2886
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2887
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2888
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2889
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2890
    "/ first, create a temporary work tree
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2891
    "/ Do not make module and package directories, their existence cause cvs checkout to fail in server mode
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2892
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2893
    tempdir := self tempDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2894
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2895
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2896
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2897
    "/ check it out there
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2898
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2899
    checkoutName :=  fullName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2900
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2901
    modulDir := module asFilename construct:packageDir.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2902
    checkoutNameLocal := modulDir constructString:(fullName asFilename baseName).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2903
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2904
    self activityNotification:'checking out source ' , checkoutName , revMsg.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2905
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2906
    packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2907
    fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2908
    fullTempName := self getTemporaryFilenameFor:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2909
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2910
    perforceCommand := ('print "' , fullFilename pathName, '#', revision, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2911
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2912
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2913
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2914
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2915
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2916
        logHeader:('get contents of ', fullFilename pathName, ' for revision ', revision, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2917
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2918
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2919
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2920
    errorStream contents notEmpty ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2921
        ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2922
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2923
    FileStream openErrorSignal handle:[:ex|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2924
        ('PerforceSourceCodeManager [error]: can not create ', fullTempName pathName) errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2925
        ^ nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2926
    ] do:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2927
        fullTempName directory recursiveMakeDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2928
        outStream := fullTempName writeStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2929
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2930
    lineNr := 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2931
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2932
    [inStream atEnd not] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2933
        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2934
        line notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2935
            lineNr = 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2936
            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2937
                outStream nextPutLine:line.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2938
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2939
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2940
        lineNr := lineNr + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2941
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2942
    outStream close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2943
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2944
    (cacheSubDir isNil) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2945
        cacheIt := false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2946
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2947
        cacheSubDir recursiveMakeDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2948
        fullCachedName := cacheSubDir constructString:cachedSourceFilename.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2949
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2950
    (cacheIt
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2951
    and:[cachedFile notNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2952
    and:[fullTempName exists]])
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2953
    ifTrue:[
12725
93efe8fda21c class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12702
diff changeset
  2954
        (OsError catch:[
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2955
            fullTempName moveTo:fullCachedName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2956
        ]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2957
            ('PerforceSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2958
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2959
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2960
        fullCachedName asFilename exists ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2961
            stream := fullCachedName asFilename readStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2962
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2963
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2964
        checkInDefinition fileName = 'extensions.st' ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2965
            self activityNotification:'Not cached - please check your settings and/or the version method in the projectDefinition.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2966
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2967
            self activityNotification:'Not cached - please check your settings.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2968
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2969
        OperatingSystem isUNIXlike ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2970
            "/ cannot remove files which are still open ...
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2971
            "/ sigh - need a delete-on-close flag in FileStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2972
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2973
            tempFile := Filename newTemporary.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2974
            fullTempName copyTo:tempFile.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2975
            stream := tempFile readStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2976
            stream notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2977
                stream removeOnClose:true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2978
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2979
        ] ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2980
            stream := fullTempName readStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2981
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2982
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2983
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2984
    ^ stream
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2985
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2986
    "Modified: / 28-06-2016 / 07:53:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2987
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2988
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2989
submit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2990
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2991
    |numbers|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2992
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2993
    numbers := self getCurrentChangeListNumbers.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2994
    numbers isEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2995
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2996
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2997
    numbers do:[:aNumber|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2998
        (self submitChangeNumber:aNumber) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2999
            ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3000
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3001
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3002
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3003
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3004
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3005
submitChangeNumber:changeNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3006
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3007
    |cmd outputStream errorStream result changeListDescription infoDialog logMsg|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3008
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3009
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3010
    self temporaryWorkSpace isNil ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3011
	self perforceError raiseErrorString:('Error getting temporary workspace when try to submot ', changeNumber printString, '.').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3012
	^false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3013
    ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3014
    changeListDescription := self getChangeDespriptionInfoFor:changeNumber printString.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3015
    infoDialog := PerforceSourceCodeManager submitInfoDialogClass
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3016
	    getCheckinInfoFor:'Perforce submit message check'
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3017
	    initialAnswer:((changeListDescription at:#Description ifAbsent:'') copy)
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3018
	    withFileList:(changeListDescription at:#Files ifAbsent:'').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3019
    infoDialog notNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3020
	logMsg := infoDialog logMessage.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3021
	(changeListDescription at:#Description ifAbsent:'') ~= logMsg asStringCollection ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3022
	    self changeChangeDescriptionTo:logMsg asStringCollection changeNumber:changeNumber printString
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3023
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3024
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3025
    cmd := ('submit -c ', changeNumber printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3026
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3027
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3028
    result := self temporaryWorkSpace executePerforceCommand:cmd
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3029
			inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3030
			inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3031
			outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3032
			errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3033
			doLog:false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3034
    result ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3035
	result := self mergeOrResolveConflictsForChangeNumber:changeNumber.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3036
	result ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3037
	    cmd := ('submit -c ', changeNumber printString).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3038
	    outputStream := ReadWriteStream on:''.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3039
	    errorStream := ReadWriteStream on:''.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3040
	    result := self temporaryWorkSpace executePerforceCommand:cmd
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3041
				inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3042
				inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3043
				outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3044
				errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3045
				logHeader:('submit change ', changeNumber printString, ' after resolve.').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3046
	    result ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3047
		^ false
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3048
	    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3049
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3050
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3051
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3052
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3053
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3054
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'basic administration'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3055
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3056
initialRevisionInfo:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3057
    "return a string usable as initial revision string"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3058
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3059
    |version workSpace foundView packagePath fullFilename depotPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3060
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3061
    checkInDefinition definitionClass isPrivate ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3062
        PerforceSourceCodeManager reportError:'refuse to get revision for private classes.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3063
        ^ nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3064
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3065
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3066
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3067
    "/ first, create a temporary work tree
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3068
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3069
"/    tempdir := checkInDefinition tempDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3070
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3071
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3072
    workSpace := PerforceSourceCodeManager getWorkSpaceForPackage:(checkInDefinition packageString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3073
    workSpace isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3074
        ('PerforceSourceCodeManager [error]: failed to create workspace for', checkInDefinition definitionObjectString)  errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3075
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3076
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3077
    checkInDefinition workSpace:workSpace.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3078
    version := PerforceSourceCodeManager versionInfoClass new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3079
    foundView := workSpace getViewForPackage:checkInDefinition package.
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3080
    packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3081
    fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3082
    depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3083
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3084
    version repositoryPathName:depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3085
    version user:workSpace owner.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3086
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3087
    s := CharacterWriteStream on:(String basicNew:40).    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3088
    Date today printOn:s format:'%d-%m-%y' language:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3089
    version date:s contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3090
    s := CharacterWriteStream on:(String basicNew:40).    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3091
    Timestamp now printOn:s format:'%h-%m-%s.%i'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3092
    version time:s contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3093
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3094
    version revision:'1'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3095
    ^ version.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3096
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3097
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3098
self initialRevisionStringFor:RTDBInspectorStartup inModule:'applistx' directory:'util/rtdb' container:'RTDBInterfaceInspector.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3099
"
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3100
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3101
    "Modified: / 28-06-2016 / 07:54:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3102
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3103
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3104
initialRevisionStringFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3105
    "return a string usable as initial revision string"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3106
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3107
    |info|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3108
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3109
    info := self initialRevisionInfo:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3110
    info notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3111
        ^info getVersionString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3112
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3113
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3114
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3115
self initialRevisionStringFor:RTDBInspectorStartup inModule:'applistx' directory:'util/rtdb' container:'RTDBInterfaceInspector.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3116
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3117
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3118
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3119
nextRevisionStringFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3120
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3121
    |versionInfo s newestRevisionNumber versionMethod versionString|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3122
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3123
    versionMethod := checkInDefinition definitionClass findVersionMethodOfManager:PerforceSourceCodeManager.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3124
    versionMethod notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3125
        versionString := (versionMethod valueWithReceiver:(checkInDefinition definitionClass theNonMetaclass) arguments:#()).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3126
        versionString notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3127
            versionInfo := PerforceSourceCodeManager versionInfoClass fromRCSString:versionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3128
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3129
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3130
    versionInfo isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3131
        versionInfo := self initialRevisionInfo:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3132
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3133
        versionInfo user:checkInDefinition workSpace owner.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3134
        s := CharacterWriteStream on:(String basicNew:40).    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3135
        Date today printOn:s format:'%d-%m-%y' language:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3136
        versionInfo date:s contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3137
        s := CharacterWriteStream on:(String basicNew:40).    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3138
        Timestamp now printOn:s format:'%h-%m-%s.%i'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3139
        versionInfo time:s contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3140
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3141
    versionInfo isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3142
        ^nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3143
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3144
    newestRevisionNumber := checkInDefinition getReposRevisionNumberBeforeCheckin.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3145
    newestRevisionNumber isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3146
        ^nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3147
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3148
    versionInfo revision:((newestRevisionNumber + 1) printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3149
    ^versionInfo getVersionString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3150
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3151
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3152
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'command execution'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3153
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3154
executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3155
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3156
        errorTo:errorStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3157
    "execute command and prepend perforce command name and global options.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3158
     execute command in the dirArg directory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3159
     The doLog argument, if false supresses a logEntry to be added
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3160
     in the cvs log file (used when reading / extracting history)"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3161
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3162
    ^self executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3163
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3164
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3165
        doLog:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3166
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3167
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3168
executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3169
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3170
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3171
        doLog:doLog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3172
    "execute command and prepend perforce command name and global options.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3173
     execute command in the dirArg directory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3174
     The doLog argument, if false supresses a logEntry to be added
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3175
     in the cvs log file (used when reading / extracting history)"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3176
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3177
    ^self executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3178
            inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3179
            errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3180
            doLog:doLog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3181
            logHeader:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3182
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3183
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3184
executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3185
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3186
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3187
        doLog:doLog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3188
        logHeader:logHeader
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3189
    "execute command and prepend perforce command name and global options.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3190
     execute command in the dirArg directory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3191
     The doLog argument, if false supresses a logEntry to be added
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3192
     in the cvs log file (used when reading / extracting history)"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3193
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3194
    |command rslt pathOfDir errorString  timeout errorMsgStream executeStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3195
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3196
    dirArg notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3197
        pathOfDir := dirArg asFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3198
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3199
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3200
    command := self getCommandOptionsForCommand:perforceCommand.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3201
    Processor isDispatching ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3202
        rslt := OperatingSystem executeCommand:command
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3203
                        inputFrom:inputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3204
                        outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3205
                        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3206
                        auxFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3207
                        inDirectory:pathOfDir
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3208
                        lineWise:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3209
                        onError:[:status| false].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3210
    ] ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3211
        PerforceCommandSemaphore critical:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3212
            |p |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3213
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3214
            p := [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3215
                rslt := OperatingSystem executeCommand:command
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3216
                                inputFrom:inputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3217
                                outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3218
                                errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3219
                                auxFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3220
                                inDirectory:pathOfDir
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3221
                                lineWise:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3222
                                onError:[:status| false].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3223
            ] fork.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3224
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3225
            timeout := (p waitUntilTerminatedWithTimeout:300). 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3226
            timeout ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3227
                ('PerforceSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3228
                rslt := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3229
                errorString := 'Perforce command timeout'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3230
            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3231
                rslt ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3232
                    errorString := ('PerforceSourceCodeManager [info]: command failed: ' , command).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3233
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3234
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3235
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3236
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3237
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3238
    PerforceSourceCodeManager verboseSourceCodeAccess == true ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3239
        executeStream := WriteStream on:''.
13926
70a1af3d7b8e AbsoluteTime -> Timestamp
Stefan Vogel <sv@exept.de>
parents: 13823
diff changeset
  3240
        executeStream nextPutAll:Timestamp now printString.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3241
        executeStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3242
        executeStream nextPutAll:('Command <', command, '>').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3243
        executeStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3244
        executeStream nextPutAll:('StdErr Output: <', errorStream contents, '>').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3245
        executeStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3246
        executeStream nextPutAll:('StdOut Output: <', outputStream contents, '>').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3247
        executeStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3248
        executeStream nextPutAll:('##############################').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3249
        Transcript showCR:executeStream contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3250
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3251
    rslt ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3252
        doLog ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3253
            errorMsgStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3254
            logHeader notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3255
                errorMsgStream nextPutAll:'Error '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3256
                errorMsgStream nextPutAll:logHeader.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3257
                errorMsgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3258
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3259
            timeout ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3260
                errorMsgStream nextPutAll:('Timeout command <', command, '>').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3261
                errorMsgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3262
            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3263
                errorMsgStream nextPutAll:('Command <', command, '>').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3264
                errorMsgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3265
                errorMsgStream nextPutAll:('Error output: ', errorStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3266
                outputStream contents notEmpty ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3267
                    errorMsgStream nextPutAll:('Output: ', outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3268
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3269
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3270
            self perforceError raiseErrorString:errorMsgStream contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3271
            SourceCodeManagerError isHandled ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3272
                SourceCodeManagerError raiseErrorString:errorMsgStream contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3273
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3274
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3275
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3276
    ^ rslt.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3277
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3278
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3279
executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3280
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3281
        errorTo:errorStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3282
        logHeader:logHeader
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3283
    "execute command and prepend perforce command name and global options.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3284
     execute command in the dirArg directory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3285
     The doLog argument, if false supresses a logEntry to be added
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3286
     in the cvs log file (used when reading / extracting history)"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3287
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3288
    ^self executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3289
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3290
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3291
        doLog:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3292
        logHeader:logHeader.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3293
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3294
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3295
getCommandOptionsForCommand:perforceCommand
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3296
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3297
    |commandStream executable port user password clientString|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3298
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3299
    commandStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3300
    executable := PerforceSourceCodeManager perforceExecutable.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3301
    (executable includes:Character space) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3302
        commandStream nextPut:$".
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3303
        commandStream nextPutAll:executable.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3304
        commandStream nextPut:$".
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3305
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3306
        commandStream nextPutAll:executable.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3307
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3308
    commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3309
    port := self perforceSettings at:#port ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3310
    port notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3311
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3312
        commandStream nextPutAll:'-p '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3313
        commandStream nextPutAll:port.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3314
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3315
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3316
    clientString := self perforceSettings at:#client ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3317
    clientString notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3318
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3319
        commandStream nextPutAll:'-c '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3320
        commandStream nextPutAll:clientString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3321
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3322
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3323
    user := self perforceSettings at:#user ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3324
    user notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3325
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3326
        commandStream nextPutAll:'-u '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3327
        commandStream nextPutAll:user.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3328
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3329
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3330
    password := self perforceSettings at:#password ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3331
    password notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3332
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3333
        commandStream nextPutAll:'-P '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3334
        commandStream nextPutAll:password.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3335
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3336
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3337
    commandStream nextPutAll:perforceCommand.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3338
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3339
    ^ commandStream contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3340
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3341
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3342
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'dialogs & helpers'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3343
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3344
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3345
    "trouble checking in - open a dialog"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3346
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3347
    ^ self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3348
        checkinTroubleDialog:title
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3349
        message:message
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3350
        log:log
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3351
        abortable:abortable
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3352
        option:optionTitle
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3353
        option2:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3354
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3355
    "Created: 10.12.1995 / 17:34:33 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3356
    "Modified: 12.9.1996 / 02:39:06 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3357
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3358
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3359
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3360
    ^self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3361
        checkinTroubleDialog:title
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3362
        message:message
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3363
        log:log
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3364
        abortable:abortable
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3365
        option:optionTitle
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3366
        option2:optionTitle2
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3367
        option3:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3368
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3369
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3370
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3371
    "trouble checking in - open a dialog"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3372
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3373
    |l box list listView optionPressed option2Pressed option3Pressed|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3374
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3375
    l := log collect:[:line | line withTabsExpanded].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3376
    list := SelectionInList with:l.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3377
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3378
    box := Dialog new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3379
    box label:(title).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3380
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3381
    (box addTextLabel:message) borderWidth:0.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3382
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3383
    l asString notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3384
        listView := SelectionInListView on:list.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3385
        listView disable.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3386
        listView height:(listView heightOfContents max:250).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3387
        box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3388
        box addVerticalSpace.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3389
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3390
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3391
    abortable ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3392
        box addAbortButton
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3393
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3394
    optionTitle notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3395
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3396
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3397
    optionTitle2 notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3398
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3399
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3400
    optionTitle3 notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3401
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3402
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3403
    box addOkButton.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3404
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3405
    box extent:(box preferredExtent).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3406
    box minExtent:box extent.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3407
    box maxExtent:box extent.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3408
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3409
    box open.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3410
    box destroy.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3411
    optionPressed == true ifTrue:[^ #option].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3412
    option2Pressed == true ifTrue:[^ #option2].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3413
    option3Pressed == true ifTrue:[^ #option3].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3414
    ^ box accepted
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3415
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3416
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3417
| changesAsLogged |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3418
changesAsLogged := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3419
1 to:10 do:[:each|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3420
    changesAsLogged add:('Hallo', each printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3421
].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3422
changesAsLogged := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3423
self checkinTroubleDialog:'Version conflict'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3424
             message:'Message Message Message Message Message Message Message Message Message Message Message Message Message Message'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3425
             log:changesAsLogged
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3426
             abortable:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3427
             option:'show conflicts'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3428
             option2:'resolve conflicts'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3429
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3430
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3431
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3432
diffTextComment
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3433
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3434
    |ws|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3435
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3436
    ws := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3437
    ws nextPutLine:'"/ ***************************************************************'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3438
    ws nextPutLine:'"/ This text contains your current versions code (blue)'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3439
    ws nextPutLine:'"/ merged with the conflicting code as found in the repository (red) which resulted'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3440
    ws nextPutLine:'"/ from some other checkin.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3441
    ws nextPutLine:'"/ Each such conflict is surrounded by green text (like this paragraph).'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3442
    ws nextPutLine:'"/ '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3443
    ws nextPutLine:'"/ Please have a look at ALL the conflicts and fix things as appropriate.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3444
    ws nextPutLine:'"/ Delete the green lines as a confirmation - I will not checkin the changed text,'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3445
    ws nextPutLine:'"/ unless no more green parts are present. This includes this comment at the top.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3446
    ws nextPutLine:'"/ ***************************************************************'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3447
    ^ ws contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3448
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3449
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3450
getRevisionForLabel:label depotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3451
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3452
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3453
    |perforceCommand outputStream errorStream result inStream line depotAndRevision|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3454
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3455
    perforceCommand := ('files "@' , label, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3456
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3457
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3458
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3459
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3460
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3461
        logHeader:('getting revision for label ', label, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3462
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3463
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3464
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3465
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3466
    [inStream atEnd not] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3467
        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3468
        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3469
            (line startsWith:depotPath) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3470
                depotAndRevision := line asCollectionOfWords first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3471
                depotAndRevision := depotAndRevision asCollectionOfSubstringsSeparatedBy:$#.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3472
                ^ depotAndRevision second
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3473
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3474
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3475
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3476
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3477
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3478
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3479
messageForChangesInClass:class revision:revisionNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3480
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3481
    |msgStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3482
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3483
    msgStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3484
    msgStream nextPutAll:'The source of '; nextPutAll:class className; nextPutAll:'has been changed in the meanwhile as listed below.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3485
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3486
    msgStream nextPutAll:'If you continue, your new changes (based upon rev. '; nextPutAll:revisionNumber printString; nextPutAll:') will be MERGED'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3487
    msgStream nextPutAll:'into the newest revision. This will combine the other version with your changes'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3488
    msgStream nextPutAll:'into a new common revision which may be different from both.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3489
    msgStream nextPutAll:'Although this is a nice feature, it may fail to create the expected result in certain situations.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3490
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3491
    msgStream nextPutAll:'You should carefully check the result - by comparing the current version with the'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3492
    msgStream nextPutAll:'most recent version in the repository. If that does not contain an acceptable version,'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3493
    msgStream nextPutAll:'change methods as required and check in again.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3494
    msgStream nextPutAll:'Be aware, that after that, the actual repository version is different from your current classes,'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3495
    msgStream nextPutAll:'and you should update your class from the repository.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3496
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3497
    msgStream nextPutAll:'Continue ?'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3498
    ^ msgStream contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3499
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3500
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3501
messageForConflictsInClass:definitionClass revision:revisionNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3502
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3503
    |msgStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3504
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3505
    msgStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3506
    msgStream nextPutAll:'The source of '; nextPutAll:definitionClass className; nextPutAll:' has been changed in the meanwhile as listed below.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3507
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3508
    msgStream nextPutAll:'Your new changes (based upon rev. '; nextPutAll:revisionNumber printString; nextPutAll:') CONFLICT with those changes'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3509
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3510
    msgStream nextPutAll:'You should fix things by comparing your class with the most recent repository version'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3511
    msgStream nextPutAll:'and change your methods avoiding conflicts. The checkin again.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3512
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3513
    ^ msgStream contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3514
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3515
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3516
messageForNoChangesInClass:class
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3517
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3518
    |msgStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3519
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3520
    msgStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3521
    msgStream nextPutAll:'The source of '; nextPutAll:class className; nextPutAll:'has been changed in the meanwhile as listed below.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3522
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3523
    msgStream nextPutAll:'I have merged your version with the newest repository version,'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3524
    msgStream nextPutAll:'and found no differences between the result and your current version'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3525
    msgStream nextPutAll:'(i.e. your version seemed up-to-date).'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3526
    ^ msgStream contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3527
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3528
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3529
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3530
    "update a revision string"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3531
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3532
    |versionInfo packageID module foundView packagePath fullFilename depotPath sourceInfo classFileName|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3533
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3534
    originalVersionString isEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3535
        packageID := PackageId from:aClass package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3536
        module := packageID module.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3537
        foundView := self getViewForPackage:module.
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3538
        packagePath := Smalltalk getPackageDirectoryForPackage:module.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3539
        sourceInfo := PerforceSourceCodeManager sourceInfoOfClass:aClass.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3540
        sourceInfo isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3541
            PerforceSourceCodeManager reportError:('no sourceInfo for class: ' , aClass name).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3542
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3543
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3544
        classFileName := PerforceSourceCodeManager containerFromSourceInfo:sourceInfo.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3545
        fullFilename := (packagePath construct:packageID directory) construct:classFileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3546
        depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3547
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3548
        versionInfo := PerforceSourceCodeManager versionInfoClass fromRepositoryPathName:depotPath.        
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3549
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3550
        versionInfo := PerforceSourceCodeManager versionInfoClass fromRCSString:originalVersionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3551
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3552
    versionInfo revision:newRevision printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3553
    ^ versionInfo getVersionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3554
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3555
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3556
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3557
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3558
    self updatedRevisionStringOf:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3559
            forRevision:'6'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3560
            with:'$','Header','$'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3561
"
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3562
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3563
    "Modified: / 28-06-2016 / 07:53:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3564
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3565
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3566
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'initialization'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3567
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3568
initialize
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3569
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3570
    PerforceCommandSemaphore := Semaphore new:10.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3571
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3572
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3573
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'queries'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3574
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3575
getDepotPathForLocalPath:aFilename
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3576
    |view|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3577
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3578
    view := self getViewForPath:aFilename.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3579
    view isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3580
        ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3581
    ].             
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3582
    ^view getDepotPathForLocalPath:aFilename
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3583
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3584
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3585
getLocalPathForDepotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3586
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3587
    |view|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3588
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3589
    view := self getViewForDepotPath:depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3590
    view notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3591
        ^view getLocalPathForDepotPath:depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3592
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3593
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3594
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3595
     | workSpace tempWorkSpace |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3596
    workSpace := PerforceSourceCodeManager getWorkSpaceForPackage:'applistx'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3597
    tempWorkSpace := workSpace temporaryWorkSpace.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3598
    tempWorkSpace getLocalPathForDepotPath:'//depot/applistx/util/libDataType/ActionLQualifier.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3599
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3600
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3601
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3602
getTemporaryFilenameFor:aFilename
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3603
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3604
    |myView checkInPart fullTempFilename|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3605
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3606
    myView := self getViewForPath:aFilename.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3607
    self temporaryWorkSpace isNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3608
	self perforceError raiseErrorString:('Error getting temporary workspace when try to get temporaryFilename.').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3609
	^nil.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3610
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3611
    self temporaryWorkSpace views do:[:aView|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3612
	myView depot = aView depot ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3613
	    checkInPart := PerforceSourceCodeManager getTrailungPathNameFrom:aFilename with:myView localPathName.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3614
	    fullTempFilename := aView localPathName asFilename construct:checkInPart.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3615
	    ^fullTempFilename
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3616
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3617
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3618
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3619
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3620
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3621
getTemporaryViewForPackage:aPackage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3622
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3623
    |myView|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3624
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3625
    myView := self getViewForPackage:aPackage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3626
    self temporaryWorkSpace isNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3627
	self perforceError raiseErrorString:('Error getting temporary workspace when try to get temporary view').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3628
	^nil.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3629
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3630
    self temporaryWorkSpace views do:[:aView|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3631
	myView depot = aView depot ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3632
	    ^ aView
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3633
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3634
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3635
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3636
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3637
getViewForDepotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3638
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3639
    |myHostName|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3640
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3641
    myHostName := OperatingSystem getHostName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3642
    (myHostName endsWith:OperatingSystem getDomainName) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3643
        myHostName := myHostName copyTo:(myHostName size - (OperatingSystem getDomainName size + 1)).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3644
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3645
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3646
    (myHostName asLowercase startsWith:(self host asLowercase)) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3647
        self perforceError raiseErrorString:('Client ', (perforceSettings at:#client), ' is made for host ', self host, ' and not for ', myHostName).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3648
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3649
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3650
    self views do:[:aView |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3651
        (aView hasViewForDepotPath:depotPath) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3652
            ^aView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3653
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3654
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3655
    self perforceError raiseErrorString:('Client ', (perforceSettings at:#client), ' have no View for depot path ', depotPath).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3656
    ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3657
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3658
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3659
getViewForPackage:aPackage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3660
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3661
    |locPackage packagePath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3662
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3663
    aPackage isNil ifTrue:[                              
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3664
        locPackage := Smalltalk package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3665
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3666
        locPackage := aPackage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3667
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3668
    packagePath := self packageDirectoryForPackageId:locPackage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3669
    packagePath notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3670
        packagePath := packagePath pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3671
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3672
        self perforceError raiseErrorString:('no package path for ', aPackage printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3673
        ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3674
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3675
    ^self getViewForPath:packagePath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3676
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3677
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3678
    PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applistx:application/rtdbInspector/builder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3679
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3680
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3681
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3682
getViewForPath:aPathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3683
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3684
    |myHostName|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3685
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3686
    myHostName := OperatingSystem getHostName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3687
    (myHostName endsWith:OperatingSystem getDomainName) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3688
        myHostName := myHostName copyTo:(myHostName size - (OperatingSystem getDomainName size + 1)).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3689
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3690
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3691
    (myHostName asLowercase startsWith:(self host asLowercase)) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3692
        self perforceError raiseErrorString:('Client ', (perforceSettings at:#client), ' is made for host ', self host, ' and not for ', myHostName).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3693
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3694
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3695
    self views do:[:aView |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3696
        (aView hasViewForPath:aPathName) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3697
            ^aView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3698
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3699
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3700
    self perforceError raiseErrorString:('Client ', (perforceSettings at:#client), ' have no View for path ', aPathName).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3701
    ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3702
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3703
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3704
hasViewForPackage:aPackage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3705
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3706
    ^(self getViewForPackage:aPackage) notNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3707
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3708
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3709
hasViewForPath:aPathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3710
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3711
    ^(self getViewForPath:aPathName) notNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3712
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3713
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3714
packageDirectoryForPackageId:package
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3715
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3716
    ^self packageDirectoryForPackageId:package checkParents:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3717
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3718
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3719
    PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applisddtx:application/rtdbInspector/builder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3720
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3721
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3722
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3723
packageDirectoryForPackageId:package checkParents:checkParents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3724
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3725
    |locPackage packagePath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3726
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3727
    locPackage := package copyReplaceAll:$: with:$/.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3728
    [ packagePath isNil ] whileTrue:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3729
        packagePath := Smalltalk getPackageDirectoryForPackage:locPackage.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3730
        packagePath notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3731
            ^packagePath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3732
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3733
        locPackage := locPackage asFilename directoryName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3734
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3735
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3736
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3737
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3738
    PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applisddtx:application/rtdbInspector/builder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3739
"
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3740
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3741
    "Modified: / 28-06-2016 / 07:54:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3742
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3743
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3744
perforceError
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3745
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3746
    ^ PerforceSourceCodeManager perforceError
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3747
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3748
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3749
perforceSettingsString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3750
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3751
    ^ PerforceSourceCodeManager getStringFromPerforceSettings:self perforceSettings
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3752
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3753
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3754
readRevisionLogEntryFromStream:inStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3755
    "read and parse a single revision info-entry from the cvs log output.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3756
     Return nil on end.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3757
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3758
     The returned information is a structure (IdentityDictionary)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3759
     filled with:
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3760
              #revision              -> the revision string
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3761
              #author                -> who checked that revision into the repository
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3762
              #date                  -> when was it checked in
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3763
              #state                 -> the RCS state
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3764
              #logMessage            -> the checkIn log message
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3765
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3766
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3767
    |revLine1 atEnd|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3768
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3769
    atEnd := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3770
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3771
    revLine1 := inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3772
    ^ self readRevisionLogEntryFromString:revLine1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3773
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3774
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3775
readRevisionLogEntryFromString:revLine1
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3776
    "read and parse a single revision info-entry from the cvs log output.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3777
     Return nil on end.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3778
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3779
     The returned information is a structure (IdentityDictionary)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3780
     filled with:
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3781
              #revision              -> the revision string
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3782
              #author                -> who checked that revision into the repository
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3783
              #date                  -> when was it checked in
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3784
              #state                 -> the RCS state
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3785
              #logMessage            -> the checkIn log message
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3786
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3787
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3788
    | record revisionLineElements noOfRevisionLineElements posText|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3789
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3790
    (revLine1 notNil) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3791
        record := IdentityDictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3792
        revisionLineElements := revLine1 asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3793
        noOfRevisionLineElements := revisionLineElements size.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3794
        noOfRevisionLineElements > 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3795
            record at:#revision put:((revisionLineElements at:2) copyFrom:2).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3796
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3797
        noOfRevisionLineElements > 8 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3798
            record at:#author put:(revisionLineElements at:9).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3799
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3800
        noOfRevisionLineElements > 6 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3801
            record at:#date put:(revisionLineElements at:7).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3802
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3803
        noOfRevisionLineElements > 4 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3804
            record at:#state put:(revisionLineElements at:5).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3805
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3806
        noOfRevisionLineElements > 10 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3807
            posText := 0.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3808
            1 to:9 do:[:ele| posText := posText + (revisionLineElements at:ele) size + 1].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3809
            record at:#logMessage put:(revLine1 copyFrom:posText).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3810
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3811
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3812
    ^record.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3813
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3814
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3815
temporaryClientName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3816
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3817
    ^ 'stxCheckinWorkSpace_', self owner, self host.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3818
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3819
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3820
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'read'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3821
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3822
getDefinitionFromServer
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3823
    |cmd myBaseDirectory outputStream errorStream rslt clients inStream line words|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3824
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3825
    cmd := 'clients -u ' , (self perforceSettings at:#user).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3826
    myBaseDirectory := (Filename currentDirectory asAbsoluteFilename) pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3827
    outputStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3828
    errorStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3829
    rslt := self  
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3830
                executePerforceCommand:cmd
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3831
                inDirectory:myBaseDirectory
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3832
                inputFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3833
                outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3834
                errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3835
                logHeader:('getting workspaces ').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3836
    rslt ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3837
        self perforceError raiseErrorString:(outputStream contents, errorStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3838
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3839
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3840
    clients := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3841
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3842
    [ inStream atEnd not ] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3843
        line := inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3844
        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3845
            words := line asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3846
            words size > 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3847
                clients add:(words at:2).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3848
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3849
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3850
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3851
    (clients includes:(self perforceSettings at:#client ifAbsent:nil)) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3852
        self perforceError raiseErrorString:('No workspace ', (self perforceSettings at:#client ifAbsent:'?'), ' for user ', (self perforceSettings at:#user ifAbsent:'?'), ' on ', (self perforceSettings at:#port ifAbsent:'?'), ' available.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3853
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3854
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3855
    cmd := 'client -o'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3856
    myBaseDirectory := (Filename currentDirectory asAbsoluteFilename) pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3857
    outputStream reset.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3858
    errorStream reset.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3859
    rslt := self 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3860
                executePerforceCommand:cmd
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3861
                inDirectory:myBaseDirectory
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3862
                inputFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3863
                outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3864
                errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3865
                logHeader:('getting empty workspace definition ').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3866
    rslt ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3867
        self perforceError raiseErrorString:(outputStream contents, errorStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3868
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3869
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3870
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3871
    self getWorkSpaceFromClientSpecFrom:inStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3872
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3873
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3874
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3875
(PerforceSourceCodeManager getWorkSpaceForPackage:'applistx') getDefinitionFromServer
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3876
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3877
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3878
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3879
getWorkSpaceFromClientSpecFrom:inStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3880
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3881
        get the workspace definition from perforce client command output
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3882
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3883
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3884
    |line nextKey |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3885
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3886
    [inStream atEnd not] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3887
        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3888
        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3889
                line first = $# ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3890
                (line startsWith:'Owner:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3891
                    self owner:line asCollectionOfWords second.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3892
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3893
                (line startsWith:'Host:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3894
                    self host:line asCollectionOfWords second.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3895
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3896
                (line startsWith:'Client:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3897
                    self client:(line asCollectionOfWords second).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3898
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3899
                (line startsWith:'Root:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3900
                    self root:((line copyFrom:('Root:' size + 1)) withoutLeadingSeparators).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3901
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3902
                (line startsWith:'View:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3903
                    nextKey := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3904
                    [nextKey not and:[inStream atEnd not]] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3905
                        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3906
                        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3907
                            line first isSeparator ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3908
                                self views add:(View newFromLine:line workspace:self).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3909
                            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3910
                                nextKey := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3911
                            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3912
                        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3913
                    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3914
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3915
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3916
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3917
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3918
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3919
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3920
newWorkSpaceFor:settingsString 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3921
    settingsString isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3922
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3923
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3924
    self perforceSettings:(PerforceSourceCodeManager 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3925
                getPerforceSettingsFromString:settingsString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3926
    self getDefinitionFromServer ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3927
        ^self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3928
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3929
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3930
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3931
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3932
newWorkSpaceForSettings:settingsDict 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3933
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3934
    settingsDict isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3935
        self perforceError raiseErrorString:('nil settings when creating workspace').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3936
        ^ self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3937
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3938
    self perforceSettings:settingsDict.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3939
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3940
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3941
!PerforceSourceCodeManagerUtilities::WorkSpace::View class methodsFor:'instance creation'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3942
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3943
newFromLine:aLine workspace:aWorkspaceDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3944
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3945
    |instance|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3946
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3947
    instance := self new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3948
    instance newFromLine:aLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3949
    instance workspace:aWorkspaceDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3950
    ^instance
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3951
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3952
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3953
!PerforceSourceCodeManagerUtilities::WorkSpace::View methodsFor:'accessing'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3954
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3955
depot
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3956
    ^ depot
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3957
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3958
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3959
depot:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3960
    depot := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3961
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3962
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3963
local
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3964
    ^ local
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3965
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3966
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3967
local:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3968
    local := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3969
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3970
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3971
type
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3972
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3973
    " there special types for views 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3974
      + for added to the same directory
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3975
      - exclude this view
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3976
        and standard view
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3977
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3978
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3979
    ^ type
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3980
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3981
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3982
type:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3983
    type := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3984
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3985
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3986
workspace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3987
    ^ workspace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3988
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3989
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3990
workspace:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3991
    workspace := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3992
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3993
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3994
!PerforceSourceCodeManagerUtilities::WorkSpace::View methodsFor:'queries'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3995
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3996
getDepotPathForLocalPath:aFilename
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3997
    |depotPath restPath unixRestPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3998
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3999
    (self hasViewForPath:aFilename) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4000
        ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4001
    ].                     
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4002
    depotPath := depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4003
    (depot endsWith:'...') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4004
        depotPath := depot copyTo:(depot size - 3).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4005
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4006
        depotPath := depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4007
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4008
    restPath := PerforceSourceCodeManager getTrailungPathNameFrom:aFilename with:self localPathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4009
    unixRestPath := (UnixFilename fromComponents:(restPath asFilename components)) pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4010
    depotPath := depotPath, unixRestPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4011
    ^depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4012
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4013
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4014
getLocalPathForDepotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4015
    |viewDepotPath restPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4016
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4017
    (self hasViewForDepotPath:depotPath) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4018
        ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4019
    ].                     
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4020
    viewDepotPath := depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4021
    (depot endsWith:'...') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4022
        viewDepotPath := depot copyTo:(depot size - 3).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4023
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4024
        viewDepotPath := depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4025
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4026
    restPath := PerforceSourceCodeManager getTrailungPathNameFrom:depotPath with:viewDepotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4027
    ^ (self localPathName asFilename construct:restPath) pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4028
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4029
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4030
hasViewForDepotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4031
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4032
    |viewDepotPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4033
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4034
    depotPath isEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4035
        ^ false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4036
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4037
    viewDepotPath := depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4038
    (depot endsWith:'...') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4039
        viewDepotPath := depot copyTo:(depot size - 3).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4040
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4041
        viewDepotPath := depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4042
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4043
    (PerforceSourceCodeManager path:depotPath hasSamePrefixLikePath:viewDepotPath) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4044
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4045
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4046
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4047
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4048
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4049
hasViewForPath:aPathname
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4050
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4051
    aPathname isEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4052
        ^ false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4053
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4054
    (PerforceSourceCodeManager path:aPathname hasSamePrefixLikePath:self localPathName) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4055
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4056
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4057
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4058
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4059
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4060
localPathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4061
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4062
    |indexOfClientString localPathName|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4063
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4064
    (local endsWith:'...') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4065
        localPathName := local copyTo:(local size -3).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4066
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4067
        localPathName := local.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4068
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4069
    indexOfClientString := local findString:workspace client.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4070
    indexOfClientString == 0 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4071
        ^workspace root.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4072
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4073
    localPathName := workspace root asFilename construct:(localPathName copyFrom:(indexOfClientString + workspace client size)).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4074
    ^localPathName pathName 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4075
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4076
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4077
!PerforceSourceCodeManagerUtilities::WorkSpace::View methodsFor:'reading'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4078
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4079
newFromLine:aLine
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4080
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4081
    |words firstIndex secondIndex theLine|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4082
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4083
    theLine := aLine withoutLeadingSeparators.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4084
    theLine := theLine withoutTrailingSeparators.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4085
    theLine isEmpty ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4086
        ^self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4087
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4088
    theLine first == $+ ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4089
        type := #+.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4090
        theLine := theLine copyFrom:2.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4091
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4092
    theLine first == $- ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4093
        type := #-.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4094
        theLine := theLine copyFrom:2.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4095
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4096
    (theLine includes:$") ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4097
        "oops we have space directories search for quotes"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4098
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4099
        firstIndex := theLine indexOf:$" startingAt:1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4100
        firstIndex == 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4101
            secondIndex := theLine indexOf:$" startingAt:firstIndex + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4102
            depot := theLine copyFrom:firstIndex + 1 to:secondIndex - 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4103
            firstIndex := theLine indexOf:$" startingAt:secondIndex + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4104
            secondIndex := theLine indexOf:$" startingAt:firstIndex + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4105
            local := theLine copyFrom:firstIndex + 1  to:secondIndex - 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4106
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4107
            depot := (theLine copyTo:firstIndex - 1) withoutTrailingSeparators.            
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4108
            local := theLine copyFrom:firstIndex + 1 to:(theLine size - 1).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4109
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4110
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4111
        words := theLine asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4112
        depot := words first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4113
        local := words second.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4114
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4115
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4116
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4117
    View newFromLine:ws contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4118
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4119
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4120
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4121
!PerforceSourceCodeManagerUtilities class methodsFor:'documentation'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4122
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4123
version
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  4124
    ^ '$Header$'
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4125
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4126
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4127
version_CVS
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  4128
    ^ '$Header$'
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4129
! !
12702
2759bbb8d06b Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 11959
diff changeset
  4130