PerforceSourceCodeManagerUtilities.st
author Jan Vrany <jan.vrany@labware.com>
Wed, 05 Oct 2022 11:57:26 +0100
branchjv
changeset 19637 28f5bfaa093d
parent 18226 346376844040
permissions -rw-r--r--
`NewSystemBrowser`: avoid updating package info when changed class is not selected This speeds up loading of packages when browser is open as it does not (needlessly) update package info which may involve scm round-trip.
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
18226
346376844040 Copyright updates
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17136
diff changeset
     3
 COPYRIGHT (c) 2016 Jan Vrany
13823
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     4
              All Rights Reserved
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     5
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
     6
 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
     7
 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
     8
 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
     9
 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
    10
 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
    11
 hereby transferred.
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    12
"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    13
"{ Package: 'stx:libtool' }"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    14
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
    15
"{ NameSpace: Smalltalk }"
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
    16
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    17
SourceCodeManagerUtilities subclass:#PerforceSourceCodeManagerUtilities
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    18
	instanceVariableNames:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    19
	classVariableNames:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    20
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    21
	category:'System-SourceCodeManagement'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    22
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    23
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    24
SimpleDialog subclass:#P4CheckinInfoDialog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
	instanceVariableNames:'descriptionHolder logMessageHolder isStableHolder tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
		quickCheckInHolder quickCheckInVisibleHolder allowEmptyLogMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    27
		warningMessageHolder logHistory logHistoryHeadLineSelectionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    28
		submitHolder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    29
	classVariableNames:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    30
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    31
	privateIn:PerforceSourceCodeManagerUtilities
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    32
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    33
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    34
SimpleDialog subclass:#SubmitInfoDialog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    35
	instanceVariableNames:'descriptionHolder logMessageHolder isStableHolder tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    36
		quickCheckInHolder quickCheckInVisibleHolder allowEmptyLogMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    37
		warningMessageHolder filesHolder tagItInHolder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    38
	classVariableNames:'LastSourceLogMessage'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    39
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    40
	privateIn:PerforceSourceCodeManagerUtilities
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    41
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    42
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    43
Object subclass:#WorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    44
	instanceVariableNames:'client host owner root views perforceSettings temporaryWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    45
		tempDirectory'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    46
	classVariableNames:'PerforceCommandSemaphore'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    47
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    48
	privateIn:PerforceSourceCodeManagerUtilities
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    49
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    50
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    51
Object subclass:#View
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    52
	instanceVariableNames:'depot local workspace type'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    53
	classVariableNames:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    54
	poolDictionaries:''
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    55
	privateIn:PerforceSourceCodeManagerUtilities::WorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    56
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    57
13823
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    58
!PerforceSourceCodeManagerUtilities class methodsFor:'documentation'!
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    59
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    60
copyright
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    61
"
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    62
 COPYRIGHT (c) 2006 by eXept Software AG
18226
346376844040 Copyright updates
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17136
diff changeset
    63
 COPYRIGHT (c) 2016 Jan Vrany
13823
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    64
              All Rights Reserved
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    65
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    66
 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
    67
 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
    68
 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
    69
 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
    70
 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
    71
 hereby transferred.
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    72
"
dd6e84508436 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13592
diff changeset
    73
! !
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    75
!PerforceSourceCodeManagerUtilities class methodsFor:'class access'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    76
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    77
checkInInfoDialogClass
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
    ^P4CheckinInfoDialog
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    80
!
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    81
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    82
submitInfoDialogClass
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    83
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    84
    ^ SubmitInfoDialog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    85
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    86
    "Created: / 01-06-2012 / 11:09:15 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    87
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    88
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    89
workSpaceClass
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    90
    ^ WorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    91
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
    "Created: / 01-06-2012 / 11:13:49 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    93
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    94
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    95
!PerforceSourceCodeManagerUtilities methodsFor:'utilities-cvs'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    96
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    97
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
    98
    "open a dialog asking for a source container;
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
    99
     return a dictionary containing module, package and filename,
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   100
     or nil if canceled."
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   101
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   102
    |box y component answer
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   103
     moduleHolder packageHolder fileNameHolder
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   104
     module package fileName
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   105
     knownContainers knownPackages packageUpdater
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   106
     packageBoxComponent fileNameBoxComponent fileNameUpdater|
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   107
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   108
    knownContainers := Set new.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   109
    Smalltalk allClassesDo:[:cls | |pckg|
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   110
        pckg := cls package.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   111
        pckg size > 0 ifTrue:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   112
            knownContainers add:(pckg upTo:$:)
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   113
        ]
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   114
    ].
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   115
    knownContainers := knownContainers asOrderedCollection reject:[:module | module isBlank].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   116
    knownContainers sort.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   117
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   118
    packageUpdater := [
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   119
        |theModulePrefix|
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
        theModulePrefix := moduleHolder value , ':'.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   122
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   123
        Cursor wait showWhile:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   124
            knownPackages := Set new.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   125
            Smalltalk allClassesDo:[:cls | |pckg idx|
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   126
                pckg := cls package.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   127
                pckg size > 0 ifTrue:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   128
                    (pckg startsWith:theModulePrefix) ifTrue:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   129
                        idx := pckg indexOf:$:.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   130
                        knownPackages add:(pckg copyFrom:idx + 1)
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
                ]
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   133
            ].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   134
            knownPackages := knownPackages asOrderedCollection.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   135
            knownPackages := knownPackages select:[:package | package isBlank not].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   136
            knownPackages sort.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   137
            packageBoxComponent list:knownPackages.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   138
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   139
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   140
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   141
    fileNameUpdater := [
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   142
        |module package files|
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   143
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   144
        Cursor read showWhile:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   145
            module := moduleHolder value ? (PackageId noProjectID).
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   146
            package := packageHolder value ? (PackageId noProjectID).
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   147
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   148
            files := PerforceSourceCodeManager getExistingContainersInModule:module directory:package.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   149
            files := files asOrderedCollection.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   150
            files := files select:[:eachFile | eachFile asFilename hasSuffix:'st'].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   151
            files sort.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   152
            fileNameBoxComponent list:files.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   153
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   154
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   155
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   156
    moduleHolder := initialModule asValue.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   157
    packageHolder := initialPackage asValue.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   158
    fileNameHolder := initialFileName asValue.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   159
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
    "/ open a dialog for this
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   162
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   163
    box := DialogBox new.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   164
    box label:title.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   165
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   166
    component := box addTextLabel:boxText withCRs.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   167
    component adjust:#left; borderWidth:0.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   168
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   169
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   170
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   171
    y := box yPosition.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   172
    component := box addTextLabel:(resources string:'Module:').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   173
    component width:0.4; adjust:#right.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   174
    box yPosition:y.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   175
    component := box addComboBoxOn:moduleHolder tabable:true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   176
    component list:knownContainers.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   177
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   178
"/    component := box addInputFieldOn:moduleHolder tabable:true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   179
    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
   180
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   181
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   182
    y := box yPosition.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   183
    component := box addTextLabel:(resources string:'Package:').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   184
    component width:0.4; adjust:#right.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   185
    box yPosition:y.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   186
    packageBoxComponent := component := box addComboBoxOn:packageHolder tabable:true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   187
"/    component := box addInputFieldOn:packageHolder tabable:true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   188
    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
   189
    packageUpdater value.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   190
    moduleHolder onChangeEvaluate:packageUpdater.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   191
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   192
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   193
    y := box yPosition.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   194
    component := box addTextLabel:(resources string:'Filename:').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   195
    component width:0.4; adjust:#right.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   196
    box yPosition:y.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   197
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   198
    forNewContainer ifTrue:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   199
        component := box addInputFieldOn:fileNameHolder tabable:true.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   200
        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
   201
    ] ifFalse:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   202
        fileNameBoxComponent := component := box addComboBoxOn:fileNameHolder tabable:true.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   203
        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
   204
        fileNameUpdater value.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   205
        packageHolder onChangeEvaluate:fileNameUpdater.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   206
    ].
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
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   209
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   210
    notice notNil ifTrue:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   211
        component := box addTextLabel:notice.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   212
        component adjust:#left; borderWidth:0.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   213
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   214
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   215
    box addVerticalSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   216
    box addAbortAndOkButtons.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   217
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   218
    (YesToAllNotification notNil and:[YesToAllNotification isHandled]) ifTrue:[
15020
76c067348d2b class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14665
diff changeset
   219
        component := Button label:(resources string:'Yes to All').
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   220
        component action:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   221
                            YesToAllNotification queryWith:true.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   222
                            box doAccept.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   223
                            box okPressed.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   224
                         ].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   225
        box addButton:component.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   226
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   227
    (AbortAllSignal isHandled) ifTrue:[
15020
76c067348d2b class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14665
diff changeset
   228
        component := Button label:(resources string:'Cancel All').
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   229
        component action:[
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   230
                            box hide.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   231
                            AbortAllSignal raiseSignal.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   232
                         ].
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   233
        box addButton:component before:nil.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   234
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   235
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   236
    (YesToAllQuery notNil and:[YesToAllQuery isHandled]) ifTrue:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   237
        answer := YesToAllQuery query.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   238
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   239
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   240
    answer isNil ifTrue:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   241
        box showAtPointer.
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   242
        answer := box accepted
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   243
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   244
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   245
    box destroy.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   246
    answer ifFalse:[
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   247
        ^ nil
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   248
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   249
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   250
    module := moduleHolder value withoutSpaces.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   251
    package := packageHolder value withoutSpaces.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   252
    fileName := fileNameHolder value withoutSpaces.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   253
    ^ Dictionary new
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   254
        at:#module put:module;
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   255
        at:#package put:package;
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   256
        at:#fileName put:fileName;
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   257
        yourself
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   258
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   259
    "
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   260
     self
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   261
        askForContainer:'enter container' title:'container' note:'some note'
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   262
        initialModule:'foo' initialPackage:'bar' initialFileName:'baz'
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   263
    "
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   264
13400
3ac19c2f9575 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12893
diff changeset
   265
    "Modified: / 29-08-2013 / 12:26:55 / cg"
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   266
!
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   267
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   268
checkinClass:aClass withInfo:aLogInfoOrNil withCheck:doCheckClass usingManager:managerOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   269
    "check a class into the source repository.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   270
     If the argument, aLogInfoOrNil isNil, ask interactively for log-message.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   271
     If doCheckClass is true, the class is checked for send of halts etc."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   272
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   273
    |logMessage checkinInfo mgr pri doSubmit|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   274
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   275
    doSubmit := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   276
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   277
    aClass isLoaded ifFalse:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   278
        self information:(resources string:'Cannot checkin unloaded classes (%1)' with:aClass name).
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   279
        ^ false.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   280
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   281
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   282
    mgr := managerOrNil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   283
    mgr isNil ifTrue:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   284
        mgr := self sourceCodeManagerFor:aClass.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   285
        mgr isNil ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   286
            ^ false
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   287
        ]
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   288
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   289
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   290
    self ensureCorrectVersionMethodsInClass:aClass usingManager:mgr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   291
    mgr supportsCheckinLogMessages ifTrue:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   292
        (self
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   293
            getLogMessageForClassCheckinTakingDefaultsFromPreviousLogInfo:aLogInfoOrNil
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   294
            forClass:aClass
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   295
            valuesInto:[:logMessageRet :checkinInfoRet |
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   296
                logMessage := logMessageRet.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   297
                checkinInfo := checkinInfoRet.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   298
                checkinInfo notNil ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   299
                    doSubmit := checkinInfo submitHolder value.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   300
                ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   301
            ]
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   302
        ) ifFalse:[^ false].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   303
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   304
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   305
    (self classIsNotYetInRepository:aClass withManager:mgr) ifTrue:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   306
        (self createSourceContainerForClass:aClass usingManager:mgr) ifFalse:[
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   307
"/            self warn:'did not create a container for ''' , aClass name , ''''.
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   308
            ^ false
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   309
        ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   310
        ^ true.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   311
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   312
16954
5e6f9500fc12 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 16876
diff changeset
   313
    self activityNotification:(resources string:'PerforceSourceCodeManager [info]: checking in %1' with:aClass name).
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   314
    pri := Processor activePriority.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   315
    Processor activeProcess withPriority:pri-1 to:pri
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   316
    do:[
14333
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   317
        |revision aborted|
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
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   320
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   321
        aborted := false.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   322
        AbortOperationRequest handle:[:ex |
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   323
            aborted := true.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   324
            ex return.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   325
        ] do:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   326
            |checkinState cause|
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   327
            checkinState := false.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   328
            cause := ''.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   329
            [
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   330
                checkinState := mgr checkinClass:aClass logMessage:logMessage submit:doSubmit
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   331
            ] on:SourceCodeManagerError do:[:ex|
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   332
                cause := ex description.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   333
                ex proceed.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   334
            ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   335
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   336
            checkinState ifFalse:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   337
                Transcript showCR:'checkin of ''' , aClass name , ''' failed - ', cause.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   338
                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
   339
                ^ false.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   340
            ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   341
            checkinInfo notNil ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   342
                checkinInfo isStable ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   343
                    "set stable tag for class that has been checked in"
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   344
                    self tagClass:aClass as:#stable.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   345
                ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   346
                checkinInfo tagIt ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   347
                    "set an additional tag for class that has been checked in"
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   348
                    self tagClass:aClass as:(checkinInfo tag).
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
            ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   351
        ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   352
        aborted ifTrue:[  |con|
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   353
            Transcript showCR:'Checkin of ''' , aClass name , ''' aborted'.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   354
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   355
            AbortAllOperationWantedQuery query ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   356
                (Dialog
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   357
                    confirm:(resources stringWithCRs:'Checkin of "%1" aborted.\\Cancel all ?' with:aClass name)
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   358
                    default:false)
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   359
                ifTrue:[
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   360
                    AbortAllOperationRequest raise.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   361
                ]
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   362
            ].
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   363
            ^ false.
3391320df63d class: PerforceSourceCodeManagerUtilities
Stefan Vogel <sv@exept.de>
parents: 13926
diff changeset
   364
        ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   365
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   366
    ^ true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   367
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   368
    "Created: / 21-12-2011 / 18:19:14 / cg"
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   369
!
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   370
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   371
defineSourceContainerForClass:aClass usingManager:mgr title:title text:boxText createDirectories:createDirs createContainer:createContainer
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   372
    "let user specify the source-repository values for aClass"
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   373
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   374
    |className
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   375
     "oldModule oldPackage" oldFileName
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   376
     module directory fileName nameSpace nameSpacePrefix
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   377
     info project nm creatingNew msg
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   378
     answer doCheckinWithoutAsking forceCheckIn rslt note
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   379
     requiredPackage projectDefinitionClass packageId|
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
    mgr isNil ifTrue:[^  false].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   382
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   383
    aClass isLoaded ifFalse:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   384
        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
   385
        ^ false.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   386
    ].
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
    className := aClass name.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   389
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   390
    aClass isProjectDefinition ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   391
        "/ no way - their package is already known and fix.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   392
        module := aClass module.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   393
        directory := aClass moduleDirectory.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   394
    ] ifFalse:[
13592
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
        "/ defaults, if nothing at all is known
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   397
        "/
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   398
        projectDefinitionClass := aClass projectDefinitionClass.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   399
        projectDefinitionClass notNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   400
            packageId := PackageId from:projectDefinitionClass package.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   401
            module := packageId module.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   402
            directory := packageId directory.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   403
        ] ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   404
            (module := LastModule) isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   405
                module := (OperatingSystem getLoginName).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   406
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   407
            (directory := LastPackage) isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   408
                directory := 'private'.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   409
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   410
        ].
12893
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
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
    "/ try to extract some useful defaults from the current project
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   415
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   416
    (Project notNil and:[(project := Project current) notNil]) ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   417
        directory isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   418
            (nm := project repositoryDirectory) isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   419
                nm := project name
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
            directory := nm.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   422
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   423
        module isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   424
            (nm := project repositoryModule) notNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   425
                module := nm
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   426
            ]
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   427
        ].
12893
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
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   430
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   431
    "/ ask the sourceCodeManager if it knows anything about that class
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   432
    "/ if so, take that as a default.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   433
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   434
    info := mgr sourceInfoOfClass:aClass.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   435
    info notNil ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   436
        true "module ~= LastModule" ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   437
            (info includesKey:#module) ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   438
                module := (info at:#module).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   439
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   440
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   441
"/        true "package ~= LastPackage" ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   442
"/            (info includesKey:#directory) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   443
"/                package := (info at:#directory).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   444
"/            ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   445
"/        ].
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   446
        fileName := mgr containerFromSourceInfo:info.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   447
        (nameSpace := aClass nameSpace) ~~ Smalltalk ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   448
            nameSpacePrefix := nameSpace name , '::'.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   449
            (fileName startsWith:nameSpacePrefix) ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   450
                fileName := fileName copyFrom:(nameSpacePrefix size + 1).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   451
            ]
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   452
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   453
"/        (info includesKey:#fileName) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   454
"/            fileName := (info at:#fileName).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   455
"/        ] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   456
"/            (info includesKey:#expectedFileName) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   457
"/                fileName := (info at:#expectedFileName).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   458
"/            ] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   459
"/                (info includesKey:#classFileNameBase) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   460
"/                    fileName := (info at:#classFileNameBase) , '.st'.
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
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   465
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   466
    fileName isNil ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   467
        fileName := (Smalltalk fileNameForClass:aClass) , '.st'.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   468
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   469
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   470
    OperatingSystem isMSDOSlike ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   471
        module replaceAll:$\ with:$/.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   472
        directory replaceAll:$\ with:$/.
12893
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
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
    "/ check for conflicts (i.e. if such a container already exists) ...
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   477
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   478
    doCheckinWithoutAsking := false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   479
"/false ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   480
"/    (mgr checkForExistingContainer:fileName inModule:module directory:directory) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   481
"/        answer := Dialog confirmWithCancel:(resources
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   482
"/                            string:'About to change the source container.
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
"/Notice: there is a container for %1 in:
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
"/    %2 / %3 / %4
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   487
"/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   488
"/Do you want to change it or check right into that container ?'
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   489
"/                            with:className
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   490
"/                            with:module
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   491
"/                            with:directory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   492
"/                            with:fileName)
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   493
"/                labels:(resources array:#('Cancel' 'Check in' 'Change')).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   494
"/        answer isNil ifTrue:[AbortSignal raise].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   495
"/        answer ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   496
"/            doCheckinWithoutAsking := false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   497
"/            oldModule := module.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   498
"/            oldPackage := directory.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   499
"/            oldFileName := fileName
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   500
"/        ] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   501
"/            doCheckinWithoutAsking := true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   502
"/            creatingNew := false.
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
"/    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   505
"/].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   506
    mgr isContainerBased ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   507
        doCheckinWithoutAsking ifFalse:[
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
            "/ open a dialog for this
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   510
            "/
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   511
            (mgr checkForExistingContainer:fileName inModule:module directory:directory) ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   512
                note := 'Notice: class seems to have no container yet.'.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   513
                creatingNew := true.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   514
            ] ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   515
                creatingNew := false.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   516
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   517
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   518
            rslt := self
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   519
                    askForContainer:boxText title:title note:note
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   520
                    initialModule:module initialPackage:directory initialFileName:fileName
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   521
                    forNewContainer:true.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   522
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   523
            rslt isNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   524
                ^ false
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   525
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   526
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   527
            module := rslt at:#module.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   528
            directory := rslt at:#package.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   529
            fileName := rslt at:#fileName.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   530
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   531
        (fileName endsWith:',v') ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   532
            fileName := fileName copyButLast:2
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   533
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   534
        (fileName endsWith:'.st') ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   535
            fileName := fileName , '.st'
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   536
        ].
12893
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
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   539
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   540
    "/ we require the packageID to be <module>:<container-dir>
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   541
    "/ check for this ...
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   542
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   543
    requiredPackage := ((module ? '') , ':' , (directory ? '')) asSymbol.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   544
    requiredPackage ~= aClass package ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   545
"/        doCheckinWithoutAsking ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   546
"/            (self confirm:'Change the classes packageID to: ''', requiredPackage , ''' ?')
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   547
"/            ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   548
"/                ^ false
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   549
"/            ]
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   550
"/        ].
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   551
        aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   552
        aClass package:requiredPackage.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   553
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   554
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   555
    info := aClass revisionInfo.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   556
    info notNil ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   557
        (info repositoryPathName isNil) ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   558
            info := nil
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   559
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   560
"/        (info includesKey:#repositoryPathName) ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   561
"/            info := nil
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
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   564
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   565
    info isNil ifTrue:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   566
        true "doCheckinWithoutAsking" ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   567
            answer := Dialog
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   568
                 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
   569
                 labels:(resources array:#( 'Cancel' 'No' 'Yes')).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   570
            answer isNil ifTrue:[^ false].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   571
        ] ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   572
            answer := true.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   573
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   574
        answer ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   575
            mgr
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   576
                updateVersionMethodOf:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   577
                for:(mgr initialRevisionStringFor:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   578
                         inModule:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   579
                         directory:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   580
                         container:fileName).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   581
        ].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   582
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   583
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   584
    (self checkForExistingModule:module usingManager:mgr allowCreate:(createDirs or:[creatingNew]))
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   585
        ifFalse:[^ false].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   586
    LastModule := module.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   587
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   588
    (self checkForExistingModule:module directory:directory usingManager:mgr allowCreate:(createDirs or:[creatingNew]))
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   589
        ifFalse:[^ false].
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   590
    LastPackage := directory.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   591
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
    "/ check for the container itself
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   594
    "/
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   595
    (mgr isContainerBased not
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   596
    or:[ mgr checkForExistingContainer:fileName inModule:module directory:directory ]) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   597
"/            (oldModule notNil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   598
"/            and:[(oldModule ~= module)
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   599
"/                 or:[oldPackage ~= package
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   600
"/                 or:[oldFileName ~= fileName]]])
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   601
"/            ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   602
"/                self warn:(resources string:'no change').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   603
"/                ^ false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   604
"/            ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   605
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   606
        mgr isContainerBased ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   607
            creatingNew ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   608
                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
   609
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   610
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   611
            doCheckinWithoutAsking ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   612
                (Dialog
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   613
                    confirm:(resources string:'check %1 into the existing container
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   614
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   615
    %2 / %3 / %4  ?'
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   616
                                    with:className
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   617
                                    with:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   618
                                    with:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   619
                                    with:fileName) withCRs
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   620
                    noLabel:'Cancel')
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   621
                ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   622
                    ^ false.
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
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   625
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   626
        oldFileName notNil ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   627
            msg := ('forced checkin / source container change from ' , oldFileName).
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   628
        ] ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   629
            msg := 'defined source container'
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   630
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   631
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   632
        (forceCheckIn := doCheckinWithoutAsking) ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   633
            (mgr
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   634
                checkinClass:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   635
                fileName:fileName
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   636
                directory:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   637
                module:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   638
                logMessage:msg)
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   639
            ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   640
                doCheckinWithoutAsking ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   641
                    (Dialog
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   642
                        confirm:'No easy merge seems possible; force checkin (no merge) ?'
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   643
                        noLabel:'Cancel')
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   644
                    ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   645
                        ^ false.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   646
                    ].
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
                forceCheckIn := true.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   649
            ]
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   650
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   651
        forceCheckIn ifTrue:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   652
            (mgr
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   653
                checkinClass:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   654
                fileName:fileName
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   655
                directory:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   656
                module:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   657
                logMessage:msg
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   658
                force:true)
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   659
            ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   660
                self warn:(resources string:'Failed to check into existing container.').
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   661
                ^ false.
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   662
            ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   663
        ].
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   664
        ^ true
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   665
    ] ifFalse:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   666
        (createContainer or:[creatingNew]) ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   667
            (Dialog
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   668
                 confirm:(resources string:'No container exists for %1 in %2/%3\\create ?'
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   669
                                      with:fileName with:module with:directory) withCRs
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   670
                 noLabel:'Cancel') ifFalse:[
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   671
                ^ false
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   672
            ]
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   673
        ]
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   674
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   675
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   676
    aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   677
    aClass package:requiredPackage.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   678
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   679
    (mgr
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   680
        createContainerFor:aClass
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   681
        inModule:module
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   682
        package:directory
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   683
        container:fileName
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   684
    ) ifFalse:[
13592
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   685
        self warn:(resources string:'Failed to create container.').
1e59bda02cf8 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 13400
diff changeset
   686
        ^ false.
12893
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
    ^ true
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   689
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
   690
    "Created: / 21-12-2011 / 18:34:02 / cg"
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   691
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   692
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   693
!PerforceSourceCodeManagerUtilities methodsFor:'utilities-p4'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   694
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   695
submit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   696
    self defaultManager submit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   697
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   698
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   699
!PerforceSourceCodeManagerUtilities methodsFor:'utilities-p4-interaction'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   700
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   701
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswerOrNil withQuickOption:withQuickOption
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   702
    "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
   703
     and other info (mark as stable, for example).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   704
     Return the info-object (actually: the dialog) or nil if aborted."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   705
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   706
    |logMsg infoDialog|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   707
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   708
    infoDialog := self defaultManager checkInInfoDialogClass 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   709
                getCheckinInfoFor:aClassNameOrPackageNameString 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   710
                initialAnswer:(initialAnswerOrNil ? LastSourceLogMessage)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   711
                withQuickOption:withQuickOption.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   712
    infoDialog notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   713
        logMsg := infoDialog logMessage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   714
        logMsg notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   715
            LastSourceLogMessage := logMsg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   716
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   717
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   718
    ^ infoDialog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   719
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   720
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   721
     SourceCodeManagerUtilities getCheckinInfoFor:'hello' initialAnswer:'bla'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   722
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   723
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   724
    "Modified: / 06-07-2010 / 11:21:28 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   725
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   726
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   727
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog class methodsFor:'documentation'!
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   730
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   731
 COPYRIGHT (c) 2005 eXept Software AG
18226
346376844040 Copyright updates
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17136
diff changeset
   732
 COPYRIGHT (c) 2016 Jan Vrany
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   733
              All Rights Reserved
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   734
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   735
 This software is furnished under a license and may be used
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   736
 only in accordance with the terms of that license and with the
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   737
 inclusion of the above copyright notice.   This software may not
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   738
 be provided or otherwise made available to, or used by, any
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   739
 other person.  No title to or ownership of the software is
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   740
 hereby transferred.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   741
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   742
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   743
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   744
documentation
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   745
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   746
    checkin-dialog.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   747
    used to be private in SourceCodeManagerUtilites.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   748
    moved to libtool because libbasic3 should not contain code inheriting from GUI classes.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   749
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   750
    [author:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   751
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   752
    [see also:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   753
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   754
    [instance variables:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   755
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   756
    [class variables:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   757
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   758
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   759
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   760
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog class methodsFor:'interface specs'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   761
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   762
windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   763
    "This resource specification was automatically generated
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   764
     by the UIPainter of ST/X."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   765
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   766
    "Do not manually edit this!! If it is corrupted,
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   767
     the UIPainter may not be able to read the specification."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   768
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   769
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   770
     UIPainter new openOnClass:PerforceSourceCodeManager::P4CheckinInfoDialog andSelector:#windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   771
     PerforceSourceCodeManager::P4CheckinInfoDialog new openInterface:#windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   772
     PerforceSourceCodeManager::P4CheckinInfoDialog open
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
    <resource: #canvas>
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   776
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   777
    ^ 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   778
     #(FullSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   779
        name: windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   780
        window: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   781
       (WindowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   782
          label: 'Enter Log Message'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   783
          name: 'Enter Log Message'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   784
          min: (Point 10 10)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   785
          bounds: (Rectangle 0 0 800 327)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   786
        )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   787
        component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   788
       (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   789
          collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   790
           (HorizontalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   791
              name: 'HorizontalPanel2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   792
              layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   793
              horizontalLayout: left
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   794
              verticalLayout: center
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   795
              horizontalSpace: 0
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   796
              verticalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   797
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   798
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   799
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   800
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   801
                    label: 'Enter checkIn log-message for:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   802
                    name: 'Label1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   803
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   804
                    resizeForLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   805
                    useDefaultExtent: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   806
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   807
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   808
                    name: 'Label2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   809
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   810
                    labelChannel: descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   811
                    useDefaultExtent: true
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
               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   815
              )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   816
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   817
           (TextEditorSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   818
              name: 'TextEditor1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   819
              layout: (LayoutFrame 2 0.0 38 0 -2 1 -125 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   820
              model: logMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   821
              hasHorizontalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   822
              hasVerticalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   823
              hasKeyboardFocusInitially: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   824
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   825
           (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   826
              name: 'Label4'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   827
              layout: (LayoutFrame 0 0.0 -119 1 0 1.0 -97 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   828
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   829
              labelChannel: warningMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   830
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   831
           (CheckBoxSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   832
              label: 'Quick Checkin (Only Classes in ChangeSet)'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   833
              name: 'CheckInChangedOnlyCheckbox'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   834
              layout: (LayoutFrame 3 0 -95 1 -3 0.5 -73 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   835
              visibilityChannel: quickCheckInVisibleHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   836
              model: quickCheckInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   837
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   838
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   839
           (CheckBoxSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   840
              label: 'Mark as Stable'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   841
              name: 'MarkStableCheckBox'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   842
              layout: (LayoutFrame 3 0 -68 1 -3 1 -46 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   843
              model: isStableHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   844
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   845
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   846
           (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   847
              label: 'Tag:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   848
              name: 'Label3'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   849
              layout: (LayoutFrame -40 0.5 -67 1 0 0.5 -45 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   850
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   851
              adjust: right
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   852
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   853
           (InputFieldSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   854
              name: 'TagEntryField'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   855
              layout: (LayoutFrame 0 0.5 -68 1 -3 1 -46 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   856
              enableChannel: tagItInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   857
              model: tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   858
              acceptOnReturn: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   859
              acceptOnTab: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   860
              acceptOnLostFocus: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   861
              acceptOnPointerLeave: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   862
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   863
           (HorizontalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   864
              name: 'ButtonPanel1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   865
              layout: (LayoutFrame 0 0.0 -40 1 0 1.0 0 1.0)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   866
              horizontalLayout: fitSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   867
              verticalLayout: center
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   868
              horizontalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   869
              verticalSpace: 2
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   870
              reverseOrderIfOKAtLeft: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   871
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   872
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   873
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   874
                 (ActionButtonSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   875
                    label: 'Cancel'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   876
                    name: 'Button2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   877
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   878
                    model: doCancel
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   879
                    extent: (Point 395 22)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   880
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   881
                 (ActionButtonSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   882
                    label: 'OK'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   883
                    name: 'Button1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   884
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   885
                    model: doAccept
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   886
                    extent: (Point 396 22)
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
               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   890
              )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   891
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   892
           (CheckBoxSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   893
              label: 'Immediate Submit'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   894
              name: 'CheckBox1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   895
              layout: (LayoutFrame 3 0.5 -95 1 -3 1 -73 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   896
              model: submitHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   897
              translateLabel: true
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
      )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   903
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   904
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   905
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog class methodsFor:'opening'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   906
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   907
getCheckinInfoFor:aString initialAnswer:initialAnswer
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   908
    ^ self 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   909
        getCheckinInfoFor:aString 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   910
        initialAnswer:initialAnswer 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   911
        withQuickOption:false
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
      self getCheckinInfoFor:'hello' initialAnswer:'bla'
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
    "Modified (format): / 12-03-2012 / 12:38:48 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   918
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   919
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   920
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   921
    ^ self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   922
        getCheckinInfoFor:aClassNameOrPackageNameString 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   923
        initialAnswer:initialAnswer 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   924
        withQuickOption:withQuickOption
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   925
        logHistory:#()
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
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
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
    "Modified: / 12-03-2012 / 12:39:00 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   932
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   933
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   934
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption logHistory:logHistoryArg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   935
    |dialog warnMessage|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   936
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   937
    warnMessage := nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   938
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   939
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   940
        dialog := self new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   941
        dialog 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   942
            description:aClassNameOrPackageNameString; 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   943
            logMessage:initialAnswer;
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   944
            withQuickOption:withQuickOption;
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   945
            logHistory:logHistoryArg.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   946
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   947
        dialog warningMessageHolder value:warnMessage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   948
        dialog open.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   949
        dialog accepted ifFalse:[ ^ nil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   950
    ] doUntil:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   951
        |stopAsking|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   952
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   953
        stopAsking := dialog allowEmptyLogMessage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   954
                      or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   955
        stopAsking ifFalse:[
16519
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
   956
            warnMessage := (self resources 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
   957
                                string:'Please enter a description of your changes!!') 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
   958
                                    withColor:Color red.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   959
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   960
        stopAsking
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   961
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   962
    ^ dialog    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   963
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
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
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
    "Created: / 12-03-2012 / 12:36:26 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   970
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   971
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   972
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog methodsFor:'accessing'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   973
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   974
allowEmptyLogMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   975
    ^ allowEmptyLogMessage ? false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   976
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   977
    "Created: / 06-07-2010 / 11:23:18 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   978
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   979
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   980
allowEmptyLogMessage:aBoolean 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   981
    allowEmptyLogMessage := aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   982
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   983
    "Created: / 06-07-2010 / 11:23:31 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   984
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   985
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   986
description
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   987
    ^ self descriptionHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   988
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   989
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   990
description:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   991
    self descriptionHolder value:aString allBold
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   992
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   993
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   994
isStable
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   995
    ^ self isStableHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   996
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   997
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   998
isStable:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   999
    self isStableHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1000
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1001
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1002
logHistory:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1003
    logHistory := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1004
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1005
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1006
logMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1007
    ^ self logMessageHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1008
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1009
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1010
logMessage:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1011
    self logMessageHolder value:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1012
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1013
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1014
quickCheckIn
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1015
    ^ self quickCheckInHolder value
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1016
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1017
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1018
quickCheckIn:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1019
    self quickCheckInHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1020
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1021
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1022
tag
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1023
    ^ self tagHolder value withoutSeparators
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1024
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1025
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1026
tag:aStringOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1027
    self tagHolder value:aStringOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1028
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1029
    "Modified: / 12-09-2006 / 12:03:50 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1030
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1031
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1032
tagIt
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1033
    ^ self tag notEmptyOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1034
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1035
    "Created: / 12-09-2006 / 13:06:49 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1036
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1037
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1038
withQuickOption:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1039
    ^ self quickCheckInVisibleHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1040
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1041
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1042
!PerforceSourceCodeManagerUtilities::P4CheckinInfoDialog methodsFor:'aspects'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1043
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1044
descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1045
    descriptionHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1046
        descriptionHolder := ValueHolder new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1047
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1048
    ^ descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1049
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1050
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1051
isStableHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1052
    isStableHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1053
        isStableHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1054
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1055
    ^ isStableHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1056
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1057
    "Modified: / 16-01-2007 / 16:00:26 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1058
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1059
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
    logHistoryHeadLineSelectionHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1062
        logHistoryHeadLineSelectionHolder := nil asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1063
        logHistoryHeadLineSelectionHolder 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1064
            onChangeEvaluate:
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1065
                [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1066
                    self logMessageHolder value:(logHistory at:logHistoryHeadLineSelectionHolder value)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1067
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1068
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1069
    ^ logHistoryHeadLineSelectionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1070
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1071
    "Created: / 12-03-2012 / 12:40:36 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1072
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1073
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1074
logHistoryHeadLines
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1075
    ^ (logHistory ? #())
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1076
        collect:[:msg |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1077
            msg withoutLeadingSeparators asCollectionOfLines first , '...'
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
    "Created: / 12-03-2012 / 12:39:35 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1081
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1082
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1083
logMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1084
    logMessageHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1085
        logMessageHolder := '' asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1086
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1087
    ^ logMessageHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1088
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1089
    "Modified: / 12-03-2012 / 12:34:13 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1090
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1091
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1092
quickCheckInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1093
    quickCheckInHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1094
        quickCheckInHolder := true asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1095
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1096
    ^ quickCheckInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1097
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1098
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1099
quickCheckInVisibleHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1100
    quickCheckInVisibleHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1101
        quickCheckInVisibleHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1102
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1103
    ^ quickCheckInVisibleHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1104
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1105
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1106
submitHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1107
    submitHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1108
        submitHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1109
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1110
    ^ submitHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1111
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1112
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1113
tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1114
    tagHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1115
        tagHolder := '' asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1116
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1117
    ^ tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1118
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1119
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1120
warningMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1121
    warningMessageHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1122
        warningMessageHolder := nil asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1123
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1124
    ^ warningMessageHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1125
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1126
    "Created: / 06-07-2010 / 11:30:29 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1127
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1128
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1129
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog class methodsFor:'documentation'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1130
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1131
copyright
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1132
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1133
 COPYRIGHT (c) 2005 eXept Software AG
18226
346376844040 Copyright updates
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17136
diff changeset
  1134
 COPYRIGHT (c) 2016 Jan Vrany
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1135
              All Rights Reserved
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1136
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1137
 This software is furnished under a license and may be used
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1138
 only in accordance with the terms of that license and with the
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1139
 inclusion of the above copyright notice.   This software may not
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1140
 be provided or otherwise made available to, or used by, any
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1141
 other person.  No title to or ownership of the software is
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1142
 hereby transferred.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1143
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1144
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1145
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1146
documentation
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1147
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1148
    checkin-dialog.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1149
    used to be private in SourceCodeManagerUtilites.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1150
    moved to libtool because libbasic3 should not contain code inheriting from GUI classes.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1151
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1152
    [author:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1153
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1154
    [see also:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1155
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1156
    [instance variables:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1157
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1158
    [class variables:]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1159
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1160
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1161
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1162
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog class methodsFor:'interface specs'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1163
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1164
windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1165
    "This resource specification was automatically generated
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1166
     by the UIPainter of ST/X."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1167
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1168
    "Do not manually edit this!! If it is corrupted,
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1169
     the UIPainter may not be able to read the specification."
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1170
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1171
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1172
     UIPainter new openOnClass:PerforceSourceCodeManager::SubmitInfoDialog andSelector:#windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1173
     PerforceSourceCodeManager::SubmitInfoDialog new openInterface:#windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1174
     PerforceSourceCodeManager::SubmitInfoDialog open
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1175
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1176
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1177
    <resource: #canvas>
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1178
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1179
    ^ 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1180
     #(FullSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1181
        name: windowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1182
        window: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1183
       (WindowSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1184
          label: 'Enter Log Message'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1185
          name: 'Enter Log Message'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1186
          min: (Point 10 10)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1187
          bounds: (Rectangle 0 0 563 561)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1188
        )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1189
        component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1190
       (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1191
          collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1192
           (HorizontalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1193
              name: 'HorizontalPanel2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1194
              layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1195
              horizontalLayout: left
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1196
              verticalLayout: center
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1197
              horizontalSpace: 0
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1198
              verticalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1199
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1200
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1201
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1202
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1203
                    label: 'Enter checkIn log-message for:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1204
                    name: 'Label1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1205
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1206
                    resizeForLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1207
                    useDefaultExtent: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1208
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1209
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1210
                    name: 'Label2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1211
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1212
                    labelChannel: descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1213
                    useDefaultExtent: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1214
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1215
                 )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1216
               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1217
              )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1218
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1219
           (VerticalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1220
              name: 'VerticalPanel1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1221
              layout: (LayoutFrame 0 0.0 38 0 0 1.0 -80 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1222
              horizontalLayout: fit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1223
              verticalLayout: topFit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1224
              horizontalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1225
              verticalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1226
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1227
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1228
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1229
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1230
                    label: 'Files:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1231
                    name: 'Label4'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1232
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1233
                    adjust: left
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1234
                    extent: (Point 563 23)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1235
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1236
                 (TextEditorSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1237
                    name: 'TextEditor1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1238
                    enableChannel: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1239
                    model: filesHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1240
                    hasHorizontalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1241
                    hasVerticalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1242
                    hasKeyboardFocusInitially: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1243
                    extent: (Point 563 146)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1244
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1245
                 (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1246
                    label: 'Log Message:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1247
                    name: 'Label5'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1248
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1249
                    adjust: left
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1250
                    extent: (Point 563 23)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1251
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1252
                 (TextEditorSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1253
                    name: 'TextEditor2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1254
                    model: logMessageHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1255
                    hasHorizontalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1256
                    hasVerticalScrollBar: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1257
                    hasKeyboardFocusInitially: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1258
                    extent: (Point 563 242)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1259
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1260
                 )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1261
               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1262
              )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1263
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1264
           (CheckBoxSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1265
              label: 'Mark as Stable'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1266
              name: 'MarkStableCheckBox'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1267
              layout: (LayoutFrame 3 0 -68 1 -3 1 -46 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1268
              model: isStableHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1269
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1270
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1271
           (LabelSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1272
              label: 'Tag:'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1273
              name: 'Label3'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1274
              layout: (LayoutFrame -40 0.5 -67 1 0 0.5 -45 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1275
              translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1276
              adjust: right
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1277
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1278
           (InputFieldSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1279
              name: 'TagEntryField'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1280
              layout: (LayoutFrame 0 0.5 -68 1 -3 1 -46 1)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1281
              enableChannel: tagItInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1282
              model: tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1283
              acceptOnReturn: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1284
              acceptOnTab: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1285
              acceptOnLostFocus: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1286
              acceptOnPointerLeave: false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1287
            )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1288
           (HorizontalPanelViewSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1289
              name: 'ButtonPanel1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1290
              layout: (LayoutFrame 0 0.0 -40 1 0 1.0 0 1.0)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1291
              horizontalLayout: fitSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1292
              verticalLayout: center
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1293
              horizontalSpace: 3
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1294
              verticalSpace: 2
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1295
              reverseOrderIfOKAtLeft: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1296
              component: 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1297
             (SpecCollection
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1298
                collection: (
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1299
                 (ActionButtonSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1300
                    label: 'Cancel'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1301
                    name: 'Button2'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1302
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1303
                    model: doCancel
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1304
                    extent: (Point 277 22)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1305
                  )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1306
                 (ActionButtonSpec
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1307
                    label: 'OK'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1308
                    name: 'Button1'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1309
                    translateLabel: true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1310
                    model: doAccept
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1311
                    extent: (Point 277 22)
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
        )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1320
      )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1321
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1322
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1323
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog class methodsFor:'opening'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1324
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1325
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withFileList:fileList
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1326
    |dialog warnMessage|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1327
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1328
    warnMessage := nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1329
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1330
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1331
        dialog := self new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1332
        dialog 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1333
            description:aClassNameOrPackageNameString; 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1334
            logMessage:initialAnswer;
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1335
            files:fileList.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1336
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1337
        dialog warningMessageHolder value:warnMessage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1338
        dialog open.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1339
        dialog accepted ifFalse:[ ^ nil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1340
    ] doUntil:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1341
        |stopAsking|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1342
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1343
        stopAsking := dialog allowEmptyLogMessage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1344
                      or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1345
        stopAsking ifFalse:[
16519
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1346
            warnMessage := (self resources 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1347
                                string:'Please enter a description of your changes!!') 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1348
                                    withColor:Color red.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1349
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1350
        stopAsking
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1351
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1352
    ^ dialog    
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
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1356
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1357
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1358
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1359
    "Modified: / 06-07-2010 / 11:40:00 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1360
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1361
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1362
getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1363
    |dialog warnMessage|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1364
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1365
    warnMessage := nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1366
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1367
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1368
        dialog := self new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1369
        dialog 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1370
            description:aClassNameOrPackageNameString; 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1371
            logMessage:initialAnswer;
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1372
            withQuickOption:withQuickOption.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1373
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1374
        dialog warningMessageHolder value:warnMessage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1375
        dialog open.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1376
        dialog accepted ifFalse:[ ^ nil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1377
    ] doUntil:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1378
        |stopAsking|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1379
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1380
        stopAsking := dialog allowEmptyLogMessage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1381
                      or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1382
        stopAsking ifFalse:[
16519
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1383
            warnMessage := (self resources 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1384
                                string:'Please enter a description of your changes!!') 
0a978c516824 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 16183
diff changeset
  1385
                                    withColor:Color red.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1386
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1387
        stopAsking
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1388
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1389
    ^ dialog    
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
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1393
     self getCheckinInfoFor:'hello' initialAnswer:'bla'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1394
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1395
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1396
    "Modified: / 06-07-2010 / 11:40:00 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1397
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1398
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1399
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog methodsFor:'accessing'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1400
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1401
allowEmptyLogMessage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1402
    ^ allowEmptyLogMessage ? false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1403
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1404
    "Created: / 06-07-2010 / 11:23:18 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1405
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1406
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1407
allowEmptyLogMessage:aBoolean 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1408
    allowEmptyLogMessage := aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1409
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1410
    "Created: / 06-07-2010 / 11:23:31 / cg"
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1414
    ^ self descriptionHolder value
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
description:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1418
    self descriptionHolder value:aString allBold
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1422
    ^ self filesHolder value
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
files:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1426
    self filesHolder value:aString
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1430
    ^ self isStableHolder value
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
isStable:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1434
    self isStableHolder value:aBoolean
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1438
    ^ self logMessageHolder value
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
logMessage:aString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1442
    self logMessageHolder value:aString
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1446
    ^ self quickCheckInHolder value
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
quickCheckIn:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1450
    self quickCheckInHolder value:aBoolean
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1454
    ^ self tagHolder value withoutSeparators
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1455
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1456
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1457
tag:aStringOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1458
    self tagHolder value:aStringOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1459
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1460
    "Modified: / 12-09-2006 / 12:03:50 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1461
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1462
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1463
tagIt
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1464
    ^ self tag notEmptyOrNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1465
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1466
    "Created: / 12-09-2006 / 13:06:49 / cg"
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
withQuickOption:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1470
    ^ self quickCheckInVisibleHolder value:aBoolean
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1471
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1472
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1473
!PerforceSourceCodeManagerUtilities::SubmitInfoDialog methodsFor:'aspects'!
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
    descriptionHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1477
        descriptionHolder := ValueHolder new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1478
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1479
    ^ descriptionHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1480
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1481
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1482
filesHolder
16183
d2dc8f201639 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 16059
diff changeset
  1483
    "automatically generated by UIPainter ..."
d2dc8f201639 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 16059
diff changeset
  1484
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1485
    <resource: #uiAspect>
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1486
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1487
    filesHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1488
        filesHolder := '' asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1489
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1490
    ^ filesHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1491
!
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
    isStableHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1495
        isStableHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1496
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1497
    ^ isStableHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1498
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1499
    "Modified: / 16-01-2007 / 16:00:26 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1500
!
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
    logMessageHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1504
        logMessageHolder := LastSourceLogMessage asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1505
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1506
    ^ logMessageHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1507
!
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
    quickCheckInHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1511
        quickCheckInHolder := true asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1512
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1513
    ^ quickCheckInHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1514
!
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
    quickCheckInVisibleHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1518
        quickCheckInVisibleHolder := false asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1519
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1520
    ^ quickCheckInVisibleHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1521
!
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
    tagHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1525
        tagHolder := '' asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1526
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1527
    ^ tagHolder
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1528
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1529
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1530
tagItInHolder
16183
d2dc8f201639 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 16059
diff changeset
  1531
    "automatically generated by UIPainter ..."
d2dc8f201639 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 16059
diff changeset
  1532
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1533
    <resource: #uiAspect>
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1534
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1535
    tagItInHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1536
        tagItInHolder := true asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1537
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1538
    ^ tagItInHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1539
!
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
    warningMessageHolder isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1543
        warningMessageHolder := nil asValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1544
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1545
    ^ warningMessageHolder.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1546
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1547
    "Created: / 06-07-2010 / 11:30:29 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1548
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1549
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1550
!PerforceSourceCodeManagerUtilities::WorkSpace class methodsFor:'instance creation'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1551
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1552
newWorkSpaceFor:aSettingsString  
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1553
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1554
        get the workspace definition from perforce client command output
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1555
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1556
    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1557
    |workSpace|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1558
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1559
    aSettingsString isEmptyOrNil ifTrue:[ ^nil].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1560
    workSpace := self new initialize.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1561
    ^ workSpace newWorkSpaceFor:aSettingsString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1562
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1563
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1564
newWorkSpaceForSettings:settingsDict
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1565
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1566
        get the workspace definition from perforce client command output"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1567
    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1568
    |workSpace|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1569
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1570
    workSpace := self new initialize.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1571
    ^ workSpace newWorkSpaceForSettings:settingsDict
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1572
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1573
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1574
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'accessing'!
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1577
    ^ client
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
client:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1581
    client := something.
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1585
    ^ host
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
host:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1589
    host := something.
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1593
    ^ owner
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
owner:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1597
    owner := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1598
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1599
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1600
perforceSettings
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1601
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1602
    perforceSettings isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1603
        perforceSettings := Dictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1604
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1605
    ^ perforceSettings
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1606
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1607
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1608
perforceSettings:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1609
    perforceSettings := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1610
    self owner:(perforceSettings at:#user ifAbsent:nil).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1611
    self client:(perforceSettings at:#client ifAbsent:nil).
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1615
    ^ root
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
root:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1619
    root := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1620
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1621
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1622
tempDirectory
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1623
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1624
    tempDirectory isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1625
        tempDirectory := PerforceSourceCodeManager createTempDirectory:nil forModule:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1626
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1627
    ^ tempDirectory
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
temporaryWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1631
    ^ temporaryWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1632
!
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
    views isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1636
        views := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1637
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1638
    ^ views
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1639
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1640
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1641
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'actions'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1642
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1643
addCheckIn:checkInDefinition submit:doSubmit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1644
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1645
    | packagePath fullFilename s perforceCommand outputStream errorStream result tmpFilename binRevision newRevisionString number|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1646
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1647
    " create container for class initial check in"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1648
    checkInDefinition isClassCheckin ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1649
        binRevision := checkInDefinition getBinaryRevisionNumber.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1650
        (binRevision notNil and:[binRevision ~= 0]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1651
            (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
  1652
                checkInDefinition definitionClass setBinaryRevision:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1653
            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1654
                ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1655
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1656
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1657
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1658
    "initial checkin here"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1659
    self activityNotification:'adding ' , checkInDefinition definitionObjectString , ' to perforce repository...'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1660
    self getTemporaryWorkspaceFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1661
    self temporaryWorkSpace isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1662
        self perforceError raiseErrorString:('Error getting temporary workspace when adding ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1663
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1664
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1665
    number := self getChangeListNumber.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1666
    number isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1667
        self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1668
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1669
    ].
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1670
    packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1671
    fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1672
    tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1673
    tmpFilename directory recursiveMakeDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1674
    s := tmpFilename writeStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1675
    checkInDefinition isClassCheckin ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1676
        newRevisionString := self initialRevisionStringFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1677
        PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses) 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1678
            of:checkInDefinition definitionClass 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1679
            for:newRevisionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1680
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1681
    checkInDefinition isClassCheckin ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1682
        PerforceSourceCodeManager fileOutSourceCodeOf:checkInDefinition definitionClass on:s.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1683
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1684
        s nextPutAll:checkInDefinition fileContents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1685
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1686
    s close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1687
    perforceCommand := ('add  -t +ko -c ' , number printString, ' "', tmpFilename pathName, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1688
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1689
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1690
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1691
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1692
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1693
        logHeader:('adding ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1694
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1695
        checkInDefinition isClassCheckin ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1696
            Class withoutUpdatingChangesDo:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1697
                checkInDefinition definitionClass class removeSelector:PerforceSourceCodeManager nameOfVersionMethodInClasses    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1698
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1699
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1700
        ^ false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1701
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1702
    result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1703
    doSubmit ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1704
        result := self submitChangeNumber:number printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1705
        checkInDefinition isClassCheckin ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1706
            " checkout in real workspace "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1707
            perforceCommand := ('sync ' , number printString, ' "', fullFilename pathName, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1708
            outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1709
            errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1710
            result := self executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1711
                inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1712
                errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1713
                logHeader:('sync in my workspace ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1714
            result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1715
                ^ false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1716
            ].        
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1717
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1718
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1719
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1720
    self activityNotification:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1721
    ^result
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1722
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1723
    "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
  1724
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1725
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1726
askForMergedSource:mergedSource 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1727
    localSource:mySource 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1728
    changesDict:changesDict 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1729
    haveRevision:haveRevision 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1730
    changesAsLogged:changesAsLogged 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1731
    pathName:pathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1732
    definitionClass:definitionClass
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1733
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1734
    |msg answer checkInRepaired emphasizedText emSep diffTextComment didAccept editor repairedText resultSource|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1735
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1736
    (changesDict notNil and:[(changesDict at:#conflicting) > 0]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1737
        "ooops must resolve conflicts"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1738
        msg := self messageForConflictsInClass:definitionClass revision:haveRevision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1739
        answer := self checkinTroubleDialog:'Version conflict'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1740
             message:msg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1741
             log:changesAsLogged
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1742
             abortable:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1743
             option:'show conflicts'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1744
             option2:'resolve conflicts'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1745
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1746
        answer == #option ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1747
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1748
            "/ show conflicts in a 3-way DiffTextView ...
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1749
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1750
            Diff3TextView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1751
                openOnMergedText:mergedSource
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1752
                label:'your version (checkin attempt)'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1753
                label:'original (base version)'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1754
                label:'newest repository version'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1755
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1756
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1757
        checkInRepaired := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1758
        answer == #option2 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1759
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1760
            "/ allow checkin of repair version
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1761
            "/ this is error prone ...
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1762
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1763
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1764
            "/ show merged version in an editor ...
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1765
            "/ ... accept will check it in.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1766
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1767
            emphasizedText := mergedSource asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1768
            emSep := (Array with:(#color->Color black) with:(#backgroundColor->Color green)).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1769
            emphasizedText := Diff3TextView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1770
                        emphasizeMergedDiff3TextFromPerforce:emphasizedText
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1771
                        origEmphasis:(Array with:(#color->Color black) with:(#backgroundColor->Color yellow))
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1772
                        otherEmphasis:(Array with:(#color->Color white) with:(#backgroundColor->Color red))
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1773
                        yourEmphasis:(Array with:(#color->Color white) with:(#backgroundColor->Color red))
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1774
                        separatorEmphasis:emSep.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1775
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1776
            diffTextComment := self diffTextComment.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1777
            diffTextComment := (Text string:diffTextComment emphasis:emSep) asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1778
            emphasizedText := diffTextComment , emphasizedText.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1779
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1780
            didAccept := false. checkInRepaired := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1781
            [didAccept not and:[checkInRepaired]] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1782
                editor := RCSConflictEditTextView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1783
                            setupWith:emphasizedText
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1784
                            title:'Resolve conflicts in ' , pathName asFilename baseName , ', then accept & close to checkin'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1785
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1786
                editor acceptAction:[:dummy |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1787
                    repairedText := editor list.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1788
                    didAccept := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1789
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1790
                didAccept := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1791
                editor topView openModal.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1792
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1793
                didAccept ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1794
                    (Dialog confirm:'You did not accept the new text. Edit again ?')
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1795
                    ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1796
                        checkInRepaired := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1797
                    ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1798
                ] ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1799
                    "/ check if all green-stuff (separators) have been removed
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1800
                    (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
  1801
                        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
  1802
                        didAccept := false.
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
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1806
            resultSource := repairedText asString string.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1807
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1808
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1809
        checkInRepaired ifTrue:[
16954
5e6f9500fc12 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 16876
diff changeset
  1810
            Transcript showCR:'PerforceSourceCodeManager [info]: checking in ' , pathName asFilename baseName , ' (manually repaired version) ...'
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1811
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1812
            'PerforceSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1813
            Transcript showCR:'checkin of ' , pathName asFilename baseName , ' aborted (conflicting changes; repository unchanged)'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1814
            ^ nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1815
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1816
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1817
        mySource = mergedSource ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1818
            msg := self messageForNoChangesInClass:definitionClass.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1819
            self checkinTroubleDialog:'Merging versions'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1820
                           message:msg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1821
                           log:changesAsLogged
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1822
                           abortable:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1823
                           option:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1824
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1825
            msg := self messageForChangesInClass:definitionClass revision:haveRevision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1826
            answer := self checkinTroubleDialog:'Merging versions'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1827
                           message:msg
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1828
                           log:changesAsLogged
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1829
                           abortable:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1830
                           option:'Stop - see first'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1831
            answer ~~ true ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1832
                answer == #option ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1833
                    DiffCodeView
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1834
                        openOn:mySource
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1835
                        label:'current version'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1836
                        and:mergedSource
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1837
                        label:'merged version'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1838
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1839
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1840
                Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1841
                ^ nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1842
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1843
            resultSource := mergedSource.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1844
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1845
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1846
    ^ resultSource
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1847
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1848
    "Modified (format): / 01-06-2012 / 10:45:09 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1849
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1850
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1851
changeChangeDescriptionTo:logLines changeNumber:changeNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1852
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1853
    |perforceCommand outputStream errorStream changeListFile result changeFileContents changeListFileStream firstIndex oldLogFileLines writeNextLine newLogFileLines currentTokenLineParts currentToken|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1854
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1855
    self temporaryWorkSpace isNil ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1856
	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
  1857
	^false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1858
    ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1859
    perforceCommand := 'change -o ', (changeNumber ? '').
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1860
    outputStream := ReadWriteStream on:''.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1861
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1862
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1863
			inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1864
			inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1865
			outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1866
			errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1867
			logHeader:('get change desription for change ', changeNumber printString, '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1868
    result ifFalse:[
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
    changeFileContents := outputStream contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1872
    changeFileContents isEmptyOrNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1873
	^false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1874
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1875
    changeListFile := self tempDirectory construct:'change'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1876
    changeListFileStream := changeListFile writeStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1877
    changeFileContents := changeFileContents asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1878
    firstIndex := changeFileContents indexOfLineStartingWith:'Description:'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1879
    firstIndex == 0 ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1880
	^false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1881
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1882
    oldLogFileLines := StringCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1883
    changeFileContents from:firstIndex do:[:aLine|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1884
	((aLine size > 1) and:[aLine first ~= $# and:[aLine first isSeparator not]]) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1885
	    currentTokenLineParts := aLine asCollectionOfSubstringsSeparatedBy:$:.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1886
	    currentTokenLineParts size > 1 ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1887
		currentToken := currentTokenLineParts first.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1888
	    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1889
	].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1890
	((aLine size > 1) and:[aLine first isSeparator and:[currentToken = 'Description']]) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1891
	    oldLogFileLines add:(aLine copyFrom:2).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1892
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1893
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1894
    newLogFileLines := StringCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1895
    changeNumber isNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1896
	newLogFileLines := logLines.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1897
    ] ifFalse:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1898
	(oldLogFileLines asString includesString:logLines asString) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1899
	    newLogFileLines := oldLogFileLines.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1900
	] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1901
	    newLogFileLines := oldLogFileLines.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1902
	    newLogFileLines addAll:logLines
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1903
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1904
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1905
    writeNextLine := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1906
    changeFileContents do:[:aLine|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1907
	writeNextLine ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1908
	    (aLine notEmpty and:[aLine first isSeparator not]) ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1909
		writeNextLine := true.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1910
	    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1911
	].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1912
	writeNextLine ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1913
	    (aLine startsWith:'Description:') ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1914
		changeListFileStream nextPutLine:aLine.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1915
		newLogFileLines do:[:logLine|
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1916
		    changeListFileStream nextPut:Character tab.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1917
		    changeListFileStream nextPutLine:logLine.
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
		writeNextLine := false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1920
	    ] ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1921
		changeListFileStream nextPutLine:aLine
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1922
	    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1923
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1924
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1925
    changeListFileStream close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1926
    perforceCommand := ('change -i < "', changeListFile pathName, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1927
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1928
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1929
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1930
			inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1931
			inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1932
			outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1933
			errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1934
			logHeader:('write change desription for change ', changeNumber printString, '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1935
    result ifFalse:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1936
	^false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1937
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1938
    ^ true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1939
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1940
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1941
checkForExistingContainer:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1942
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1943
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1944
    |perforceCommand outputStream errorStream result packagePath fullFilename depotPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1945
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1946
    packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1947
    fullFilename := packagePath construct:checkInDefinition packageDir.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1948
    depotPath := self getDepotPathForLocalPath:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1949
    perforceCommand := ('dirs "' ,depotPath , '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1950
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1951
    errorStream := ReadWriteStream on:''.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1952
    self getTemporaryWorkspaceFor:checkInDefinition.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1953
    self temporaryWorkSpace isNil ifTrue:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1954
        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
  1955
        ^false.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1956
    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1957
    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
  1958
        inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1959
        errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1960
        logHeader:('dirs in checkForExistingContainer for ', depotPath, '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1961
    result ifFalse:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1962
        ^ false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1963
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1964
    errorStream contents notEmpty ifTrue:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1965
        ^false
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
    ^ true
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1968
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1969
    "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
  1970
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1971
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1972
checkIn:checkInDefinition submit:doSubmit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1973
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1974
    | packagePath fullFilename s perforceCommand outputStream errorStream result tmpFilename fileNameAndRev tmpFilenameAndRev
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1975
      haveChange nextVersionMethod diffOutput number baseRevision cls newestInRepository newVersionString openChangeNumber|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1976
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1977
    self activityNotification:'checkin ' , checkInDefinition definitionObjectString , ' to perforce repository...'.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  1978
    [
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1979
        cls := checkInDefinition definitionClass.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1980
        self getTemporaryWorkspaceFor:checkInDefinition.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1981
        self temporaryWorkSpace isNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1982
            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
  1983
            ^false.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1984
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1985
        baseRevision := checkInDefinition getLocalRevisionNumber.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1986
        newestInRepository := checkInDefinition getReposRevisionNumberBeforeCheckin.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1987
        (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
  1988
            (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
  1989
            ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1990
                newVersionString := self updatedRevisionStringOf:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1991
                                        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
  1992
                PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1993
                        of:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1994
                        for:newVersionString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1995
                baseRevision := checkInDefinition getLocalRevisionNumber.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1996
                baseRevision notNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  1997
                        (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
  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
            ] ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2003
                ^false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2004
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2005
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2006
        packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2007
        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
  2008
        tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2009
        tmpFilename directory recursiveMakeDirectory.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2010
        checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2011
            baseRevision > newestInRepository ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2012
                openChangeNumber := self getOpenChangeFor:checkInDefinition.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2013
                openChangeNumber isNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2014
                    (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
  2015
                    ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2016
                        newVersionString := self updatedRevisionStringOf:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2017
                                                    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
  2018
                        PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2019
                            of:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2020
                            for:newVersionString.
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
                        cls updateVersionMethodFor:newVersionString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2023
                    ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2024
                ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2025
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2026
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2027
        checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2028
            fileNameAndRev := checkInDefinition fileName, '#', baseRevision printString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2029
        ] ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2030
            fileNameAndRev := checkInDefinition fileName, '#', newestInRepository printString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2031
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2032
        tmpFilenameAndRev := tmpFilename directory construct:fileNameAndRev.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2033
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2034
        openChangeNumber notNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2035
            s := tmpFilename writeStream.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2036
            checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2037
                PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2038
            ] ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2039
                s nextPutAll:checkInDefinition fileContents.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2040
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2041
            s close.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2042
            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
  2043
            doSubmit ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2044
                self submitChangeNumber:openChangeNumber printString
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2045
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2046
            ^true
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2047
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2048
        perforceCommand := ('revert "' , tmpFilename pathName, '"').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2049
        outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2050
        errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2051
        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
  2052
            inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2053
            errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2054
            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
  2055
        result ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2056
            ^ false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2057
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2058
        perforceCommand := ('sync -f "' , tmpFilenameAndRev pathName, '"').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2059
        outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2060
        errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2061
        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
  2062
            inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2063
            errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2064
            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
  2065
        result ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2066
            ^ false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2067
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2068
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2069
        number := self getChangeListNumber.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2070
        number isNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2071
            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
  2072
            ^false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2073
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2074
        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
  2075
        outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2076
        errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2077
        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
  2078
            inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2079
            errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2080
            logHeader:('edit ', checkInDefinition definitionObjectString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2081
        result ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2082
            ^ false
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2083
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2084
        s := tmpFilename writeStream.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2085
        checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2086
            PerforceSourceCodeManager fileOutSourceCodeOf:cls on:s.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2087
        ] ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2088
            s nextPutAll:checkInDefinition fileContents.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2089
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2090
        s close.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2091
        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
  2092
        outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2093
        errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2094
        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
  2095
            inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2096
            errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2097
            logHeader:('diff ', checkInDefinition definitionObjectString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2098
        diffOutput := outputStream contents asStringCollection.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2099
        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
  2100
        haveChange ifFalse:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2101
            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
  2102
            newestInRepository ~= baseRevision ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2103
                newVersionString := self updatedRevisionStringOf:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2104
                                            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
  2105
                PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2106
                        of:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2107
                        for:newVersionString.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2108
            ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2109
            perforceCommand := ('revert "' , tmpFilename pathName, '"').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2110
            outputStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2111
            errorStream := ReadWriteStream on:''.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2112
            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
  2113
                inputFrom:nil outputTo:outputStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2114
                errorTo:errorStream
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2115
                logHeader:('revert ', checkInDefinition definitionObjectString, '.').
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2116
            ^true
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2117
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2118
        checkInDefinition isClassCheckin ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2119
            nextVersionMethod := self nextRevisionStringFor:checkInDefinition.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2120
            nextVersionMethod isNil ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2121
                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
  2122
                ^false
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
            PerforceSourceCodeManager updateVersionMethod:(PerforceSourceCodeManager nameOfVersionMethodInClasses)
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2125
                    of:cls
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2126
                    for:nextVersionMethod.
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2127
        ].
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2128
        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
  2129
        doSubmit ifTrue:[
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2130
            result := self submitChangeNumber:number printString
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2131
        ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2132
    ] ensure:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2133
        self activityNotification:''.
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
    ^result
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2136
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2137
    "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
  2138
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2139
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2140
createChange
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2141
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2142
    ^self changeChangeDescriptionTo:('' asStringCollection) changeNumber:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2143
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2144
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2145
createWorkSpaceClientSpecFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2146
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2147
    |ws myView|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2148
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2149
    ws := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2150
    ws nextPutAll:'Client: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2151
    ws nextPutAll:(self client).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2152
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2153
    ws nextPutAll:'Owner: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2154
    ws nextPutAll:(self owner).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2155
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2156
    ws nextPutAll:'Host: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2157
    ws nextPutAll:(self host).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2158
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2159
    ws nextPutAll:'Description: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2160
    ws nextPutAll:'Used temporary for Smalltalk/X'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2161
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2162
    ws nextPutAll:'Root: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2163
    ws nextPutAll:(self root asFilename pathName).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2164
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2165
    ws nextPutAll:'Options: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2166
    ws nextPutAll:'allwrite noclobber nocompress unlocked nomodtime normdir'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2167
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2168
    ws nextPutAll:'SubmitOptions: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2169
    ws nextPutAll:'submitunchanged'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2170
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2171
    ws nextPutAll:'LineEnd: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2172
    ws nextPutAll:'local'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2173
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2174
    ws nextPutAll:'View: '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2175
    myView := checkInDefinition workSpace getViewForPackage:checkInDefinition package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2176
    ws nextPutAll:myView depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2177
    ws space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2178
    ws nextPutAll:'//', self client, '/...'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2179
    ws cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2180
    ws close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2181
    ^ws contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2182
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2183
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2184
delete:checkInDefinition submit:doSubmit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2185
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2186
    | packagePath fullFilename perforceCommand outputStream errorStream result tmpFilename number newestInRepository|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2187
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2188
    self activityNotification:'delete ' , checkInDefinition definitionObjectString , ' from perforce repository...'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2189
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2190
        newestInRepository := checkInDefinition getReposRevisionNumberBeforeCheckin.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2191
        newestInRepository isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2192
            self information:(checkInDefinition definitionObjectString, ' not exists in repository.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2193
            ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2194
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2195
        self getTemporaryWorkspaceFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2196
        self temporaryWorkSpace isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2197
            self perforceError raiseErrorString:('Error getting temporary workspace when check in ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2198
            ^false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2199
        ].
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2200
        packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2201
        fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2202
        tmpFilename := self getTemporaryFilenameFor:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2203
        tmpFilename directory recursiveMakeDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2204
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2205
        number := self getChangeListNumber.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2206
        number isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2207
            self perforceError raiseErrorString:('Error when getting a change list for ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2208
            ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2209
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2210
        perforceCommand := ('delete -c ' ,number printString, ' "', tmpFilename pathName, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2211
        outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2212
        errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2213
        result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2214
            inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2215
            errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2216
            logHeader:('Error delete ', checkInDefinition definitionObjectString, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2217
        result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2218
            ^ false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2219
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2220
        result := self changeChangeDescriptionTo:checkInDefinition logMessage asStringCollection changeNumber:number printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2221
        doSubmit ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2222
            result := self submitChangeNumber:number printString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2223
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2224
    ] ensure:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2225
        self activityNotification:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2226
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2227
    ^result
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2228
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2229
    "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
  2230
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2231
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2232
deleteWorkSpaceFromServer
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2233
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2234
    |perforceCommand outputStream errorStream result tmpWorkSpace|
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2235
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2236
    tmpWorkSpace := self temporaryWorkSpace.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2237
    tmpWorkSpace isNil ifTrue:[ ^true].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2238
    perforceCommand := ('client -df ', client).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2239
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2240
    errorStream := ReadWriteStream on:''.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2241
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2242
	inputFrom:nil outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2243
	errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2244
	logHeader:('delete client ', client).
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2245
    result ifFalse:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2246
	^ false
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2247
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2248
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2249
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2250
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2251
getChangeDespriptionInfoFor:changeNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2252
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2253
    |valuePairs startLineIndex keyEndIndex changeContents cmd outputStream errorStream result keyValues beginLine endLine keyName keyValue|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2254
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2255
    self temporaryWorkSpace isNil ifTrue:[
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2256
        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
  2257
        ^nil.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2258
    ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2259
    valuePairs := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2260
    cmd := 'change -o ', (changeNumber ? '').
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2261
    outputStream := ReadWriteStream on:''.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2262
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2263
    result := self temporaryWorkSpace executePerforceCommand:cmd
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2264
                        inDirectory:self tempDirectory
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2265
                        inputFrom:nil
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2266
                        outputTo:outputStream
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2267
                        errorTo:errorStream
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2268
                        logHeader:('getting change description ', (changeNumber ? ''), '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2269
    result ifFalse:[
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2270
        ^ nil
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2271
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2272
    changeContents := outputStream contents asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2273
    changeContents doWithIndex:[:aLine :index|
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2274
        startLineIndex isNil ifTrue:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2275
            (aLine isEmpty or:[(aLine startsWith:$#) or:[aLine first isSeparator]]) ifFalse:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2276
                keyEndIndex := aLine indexOf:$:.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2277
                keyEndIndex ~~ 0 ifTrue:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2278
                    startLineIndex := index.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2279
                    valuePairs add:(Array with:index with:nil with:(aLine copyTo:keyEndIndex - 1)).
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2280
                ].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2281
            ].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2282
        ] ifFalse:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2283
            (aLine isEmpty or:[aLine startsWith:$#]) ifTrue:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2284
                valuePairs last at:2 put:index.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2285
                startLineIndex := nil.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2286
            ].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2287
        ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2288
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2289
    keyValues := Dictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2290
    valuePairs do:[:each|
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2291
        beginLine := each first.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2292
        endLine := each second.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2293
        keyName := each last.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2294
        (beginLine == (endLine - 1)) ifTrue:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2295
            keyValue := (changeContents at:beginLine) copyFrom:(keyName size + 2).
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2296
            keyValue := (keyValue withoutLeadingSeparators withoutTrailingSeparators) asStringCollection.
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2297
        ] ifFalse:[
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2298
            keyValue := changeContents copyFrom:(beginLine + 1) to:(endLine - 1).
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2299
            keyValue := keyValue collect:[:each | each withoutLeadingSeparators withoutTrailingSeparators].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2300
        ].
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  2301
        keyValues at:keyName put:keyValue.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2302
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2303
    ^ keyValues.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2304
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2305
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2306
getChangeListNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2307
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2308
    |numbers|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2309
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2310
    numbers := self getCurrentChangeListNumbers.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2311
    numbers notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2312
        ^numbers first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2313
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2314
    self createChange ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2315
        numbers := self getCurrentChangeListNumbers.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2316
        numbers notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2317
            ^numbers first.
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
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2321
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2322
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2323
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2324
getCurrentChangeListNumbers
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2325
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2326
    |perforceCommand outputStream errorStream result pendingChangesOutput words numbers number|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2327
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2328
    self temporaryWorkSpace isNil ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2329
	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
  2330
	^nil.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2331
    ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2332
    perforceCommand := 'changes -s pending -u ', owner.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2333
    outputStream := ReadWriteStream on:''.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2334
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2335
    result := self temporaryWorkSpace executePerforceCommand:perforceCommand
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2336
			inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2337
			inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2338
			outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2339
			errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2340
			doLog:false.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2341
    result ifFalse:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2342
	^ nil
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2343
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2344
    numbers := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2345
    pendingChangesOutput := outputStream contents asStringCollection.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2346
    pendingChangesOutput do:[:eachLine|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2347
	words := eachLine asCollectionOfWords.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2348
	words size > 1 ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2349
	    number := Number readFrom:(ReadStream on:(words at:2)) onError:nil.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2350
	    numbers add:number.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2351
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2352
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2353
    ^numbers
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2354
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2355
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2356
getFileStatForPathname:aPathname
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2357
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2358
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2359
    |perforceCommand outputStream errorStream result fileStatDict endOfKeywordIndex keyWord keyValue|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2360
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2361
    perforceCommand := ('fstat  "' , aPathname, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2362
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2363
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2364
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2365
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2366
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2367
        logHeader:('getting file status from ', aPathname, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2368
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2369
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2370
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2371
    fileStatDict := Dictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2372
    outputStream contents asStringCollection do:[:aLine|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2373
        endOfKeywordIndex := aLine indexOfSeparatorStartingAt:5.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2374
        keyWord := aLine copyFrom:5 to:(endOfKeywordIndex - 1).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2375
        keyValue := aLine copyFrom:endOfKeywordIndex + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2376
        fileStatDict at:keyWord put:keyValue.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2377
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2378
    ^ fileStatDict
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2379
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2380
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2381
     | workSpace tempWorkSpace dict|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2382
    workSpace := PerforceSourceCodeManager getWorkSpaceForPackage:'applistx'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2383
    tempWorkSpace := workSpace temporaryWorkSpace.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2384
    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
  2385
    dict includesKey:'unresolved'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2386
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2387
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2388
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2389
getOpenChangeFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2390
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2391
    |numbers changeDescr files versionInfo|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2392
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2393
    numbers := self getCurrentChangeListNumbers.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2394
    numbers notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2395
        numbers do:[:changeNumber|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2396
            changeDescr := self getChangeDespriptionInfoFor:changeNumber printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2397
            files := changeDescr at:#Files ifAbsent:[nil].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2398
            files notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2399
                versionInfo := PerforceSourceCodeManager versionInfoClass fromRCSString:checkInDefinition getLocalRevisionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2400
                files do:[:aFileAndAction|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2401
                    (aFileAndAction startsWith:versionInfo repositoryPathName) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2402
                        ^changeNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2403
                    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2404
                ].
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
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2408
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2409
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2410
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2411
getTemporaryWorkspaceFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2412
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2413
        create an temporary workspace for handle checkin
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2414
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2415
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2416
    |workSpaceName workSpaceDefinitionFilename ws perforceCommand result readStream  directory 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2417
     settingsTemporary myView outputStream errorStream lineStream clientSpec index words|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2418
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2419
    directory := self tempDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2420
    workSpaceName := self temporaryClientName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2421
    perforceCommand := 'clients -u ' , (self perforceSettings at:#user).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2422
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2423
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2424
    result := self executePerforceCommand:perforceCommand
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2425
                        inDirectory:directory pathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2426
                        inputFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2427
                        outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2428
                        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2429
                        doLog:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2430
                        logHeader:('check for existing workspace client.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2431
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2432
        temporaryWorkSpace := nil.
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 := outputStream contents asStringCollection findFirst:[:aLine|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2435
        words := aLine asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2436
        words size > 1 and:[words second = workSpaceName]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2437
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2438
    index = 0 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2439
        temporaryWorkSpace := nil.   
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2440
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2441
    temporaryWorkSpace isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2442
        directory exists ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2443
            self perforceError raiseErrorString:('Perforce temporary workspace directory ', directory pathName, ' not exists.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2444
            ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2445
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2446
        settingsTemporary := self perforceSettings copy.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2447
        settingsTemporary at:#client put:workSpaceName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2448
        temporaryWorkSpace := self class newWorkSpaceForSettings:settingsTemporary.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2449
        temporaryWorkSpace root:directory asFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2450
        temporaryWorkSpace host:self host.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2451
        myView := self getViewForPackage:checkInDefinition package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2452
        lineStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2453
        lineStream nextPutAll:myView depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2454
        lineStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2455
        lineStream nextPutAll:'//', workSpaceName, '/...'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2456
        temporaryWorkSpace views add:(View newFromLine:lineStream contents workspace:temporaryWorkSpace).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2457
        workSpaceDefinitionFilename := directory asFilename construct:workSpaceName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2458
        clientSpec := temporaryWorkSpace createWorkSpaceClientSpecFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2459
        ws := workSpaceDefinitionFilename writeStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2460
        ws nextPutAll:clientSpec.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2461
        ws close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2462
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2463
        readStream := ReadStream on:clientSpec.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2464
        perforceCommand := 'client -i < "', workSpaceDefinitionFilename pathName, '"'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2465
        outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2466
        errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2467
        result := temporaryWorkSpace executePerforceCommand:perforceCommand
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2468
                            inDirectory:directory pathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2469
                            inputFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2470
                            outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2471
                            errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2472
                            doLog:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2473
                            logHeader:('writing temporary workspace definition.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2474
        result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2475
            temporaryWorkSpace := nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2476
        ]. 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2477
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2478
    ^temporaryWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2479
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2480
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2481
mergeOrResolveConflictsForChangeNumber:aNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2482
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2483
    | tmpFilename perforceCommand outputStream errorStream result s
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  2484
      changesAsLogged inStream line changesDict chunksPart words mergedSource mySource
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2485
      localRevision resultSource definitionClass descriptionInfo resolveFiles depotPath localPath checkInDefinition fileStatDict|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2486
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2487
    self temporaryWorkSpace isNil ifTrue:[
16876
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2488
        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
  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
    descriptionInfo := (self getChangeDespriptionInfoFor:aNumber printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2492
    descriptionInfo 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 := descriptionInfo at:#Files ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2496
    resolveFiles isNil ifTrue:[
16876
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2497
        ^false.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2498
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2499
    resolveFiles do:[:aFileLine|
16876
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2500
        depotPath := (aFileLine copyTo:((aFileLine lastIndexOf:$#) - 1 )) withoutTrailingSeparators.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2501
        localPath := self temporaryWorkSpace getLocalPathForDepotPath:depotPath.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2502
        fileStatDict := self temporaryWorkSpace getFileStatForPathname:localPath.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2503
        (fileStatDict includesKey:'unresolved') ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2504
            definitionClass := Smalltalk at:(localPath asFilename withoutSuffix baseName asSymbol) ifAbsent:nil.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2505
            checkInDefinition := PerforceSourceCodeManager getCheckInDefinitionForClass:definitionClass.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2506
            localRevision := checkInDefinition getLocalRevisionNumber.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2507
            tmpFilename := localPath asFilename.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2508
            perforceCommand := ('resolve -af  "' , tmpFilename pathName, '"').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2509
            outputStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2510
            errorStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2511
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2512
                inputFrom:nil outputTo:outputStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2513
                errorTo:errorStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2514
                logHeader:('resolving ', tmpFilename pathName, '.').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2515
            result ifFalse:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2516
                ^ false
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
            "check for conflicts"
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2519
            changesAsLogged := StringCollection new.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2520
            inStream := ReadStream on:(outputStream contents).
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2521
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2522
            [inStream atEnd not] whileTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2523
                line:= inStream nextLine.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2524
                line notNil ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2525
                    (line startsWith:'Diff chunks:') ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2526
                        changesAsLogged add:line.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2527
                        changesDict := Dictionary new.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2528
                        chunksPart := line copyFrom:('Diff chunks:' size + 1).
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2529
                        (chunksPart asCollectionOfSubstringsSeparatedBy:$+) do:[:eachElement|
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2530
                            words := eachElement asCollectionOfWords.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2531
                            changesDict at:words second asSymbol put:words first asNumber.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2532
                        ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2533
                    ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2534
                ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2535
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2536
            s := WriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2537
            PerforceSourceCodeManager fileOutSourceCodeOf:definitionClass on:s.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2538
            mergedSource := tmpFilename readStream contents asString.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2539
            mySource := s contents asString.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2540
            resultSource := self askForMergedSource:mergedSource
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2541
                    localSource:mySource
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2542
                    changesDict:changesDict
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2543
                    haveRevision:(fileStatDict at:'haveRev' ifAbsent:nil)
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2544
                    changesAsLogged:changesAsLogged
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2545
                    pathName:tmpFilename pathName
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2546
                    definitionClass:definitionClass.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2547
            resultSource isNil ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2548
                ^false.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2549
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2550
            "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
  2551
            perforceCommand := ('revert "' , tmpFilename pathName, '"').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2552
            outputStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2553
            errorStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2554
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2555
                inputFrom:nil outputTo:outputStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2556
                errorTo:errorStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2557
                logHeader:('revert after resolving ', tmpFilename pathName, '.').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2558
            result ifFalse:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2559
                ^ false
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2560
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2561
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2562
            tmpFilename remove.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2563
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2564
            perforceCommand := ('sync -f "' , tmpFilename pathName, '"').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2565
            outputStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2566
            errorStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2567
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2568
                inputFrom:nil outputTo:outputStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2569
                errorTo:errorStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2570
                logHeader:('sync after resolving ', tmpFilename pathName, '.').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2571
            result ifFalse:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2572
                ^ false
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2573
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2574
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2575
            perforceCommand := ('edit -c ', aNumber printString, ' "' , tmpFilename pathName, '"').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2576
            outputStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2577
            errorStream := ReadWriteStream on:''.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2578
            result := self temporaryWorkSpace executePerforceCommand:perforceCommand inDirectory:self temporaryWorkSpace root
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2579
                inputFrom:nil outputTo:outputStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2580
                errorTo:errorStream
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2581
                logHeader:('edit after resolving ', tmpFilename pathName, '.').
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2582
            result ifFalse:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2583
                ^ false
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2584
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2585
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2586
            "write my result"
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2587
            resultSource notNil ifTrue:[
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2588
                s := tmpFilename writeStream.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2589
                s nextPutAll:resultSource.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2590
                s close.
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2591
            ].
0f63648af10e #OTHER by stefan
Stefan Vogel <sv@exept.de>
parents: 16806
diff changeset
  2592
        ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2593
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2594
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2595
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2596
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2597
releaseWorkSpace
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2598
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2599
    temporaryWorkSpace notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2600
        temporaryWorkSpace deleteWorkSpaceFromServer.   
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2601
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2602
    tempDirectory notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2603
        tempDirectory recursiveRemove.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2604
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2605
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2606
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2607
revisionLogOf:clsOrNil 
14665
9cc738d8e4e7 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14333
diff changeset
  2608
        fromRevision:firstRev toRevision:lastRef numberOfRevisions:numRevisions 
9cc738d8e4e7 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14333
diff changeset
  2609
        fileName:classFileName directory:packageDir module:aPackage
9cc738d8e4e7 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14333
diff changeset
  2610
9cc738d8e4e7 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 14333
diff changeset
  2611
    "actually do return a revisionLog. The main worker method."
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2612
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2613
    |atEnd line inHeaderInfo info record revisionRecords headerOnly msg revArg infoAndLogString elements 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2614
     foundView outputStream errorStream inStream packagePath fullFilename depotPath perforceCommand result labelLineElements tags label revision|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2615
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2616
    [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2617
        revArg := ''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2618
        headerOnly := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2619
        (firstRev notNil or:[lastRef notNil]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2620
            (firstRev == 0 and:[lastRef == 0]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2621
                headerOnly := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2622
            ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2623
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2624
        foundView := self getViewForPackage:aPackage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2625
        headerOnly ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2626
            msg := 'fetching revision info '
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2627
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2628
            msg := 'reading revision log '
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2629
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2630
        clsOrNil isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2631
            foundView notNil ifTrue:[            
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2632
                msg := msg , 'in ', foundView local.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2633
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2634
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2635
            msg := msg , 'of ', clsOrNil name.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2636
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2637
        self activityNotification:msg,'...'.
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2638
        packagePath := Smalltalk getPackageDirectoryForPackage:aPackage.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2639
        fullFilename := (packagePath construct:packageDir) construct:classFileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2640
        depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2641
        perforceCommand := ('filelog "' , depotPath, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2642
        outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2643
        errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2644
        result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2645
            inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2646
            errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2647
            logHeader:('getting filelog ', depotPath, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2648
        result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2649
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2650
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2651
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2652
        "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2653
        "/ read the commands pipe output and extract the container info
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2654
        "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2655
        info := IdentityDictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2656
        inHeaderInfo := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2657
        revisionRecords := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2658
        info at:#revisions put:revisionRecords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2659
        inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2660
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2661
            line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2662
            line notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2663
                |gotIt|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2664
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2665
                gotIt := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2666
                infoAndLogString := line asCollectionOfSubstringsSeparatedBy:$'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2667
                elements := infoAndLogString size.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2668
                elements > 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2669
                    record := self readRevisionLogEntryFromString:line.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2670
                    ((record at:#state ifAbsent:'') = 'delete') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2671
                        info at:#newestRevision put:#deleted.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2672
                    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2673
                        info at:#newestRevision put:(record at:#revision).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2674
                    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2675
                    info at:#numberOfRevisions put:((record at:#revision) asNumber).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2676
                    revisionRecords add:record.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2677
                    inHeaderInfo := false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2678
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2679
            ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2680
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2681
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2682
        info isEmpty ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2683
            ('PerforceSourceCodeManager [warning]: no log for ', depotPath) errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2684
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2685
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2686
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2687
        "/ strip selected revisions from the total-revisions entry
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2688
        headerOnly ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2689
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2690
            "/ continue to read the commands pipe output
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2691
            "/ and extract revision info records
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2692
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2693
            atEnd := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2694
            [atEnd or:[inStream atEnd]] whileFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2695
                record := self readRevisionLogEntryFromStream:inStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2696
                record isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2697
                    atEnd := true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2698
                ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2699
                    revisionRecords add:record.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2700
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2701
                (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2702
                    atEnd := true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2703
                ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2704
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2705
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2706
    ] ensure:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2707
        outputStream notNil ifTrue:[outputStream close].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2708
        self activityNotification:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2709
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2710
    perforceCommand := ('labels "' , depotPath, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2711
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2712
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2713
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2714
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2715
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2716
        logHeader:('getting labels ', depotPath, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2717
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2718
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2719
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2720
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2721
    tags := Dictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2722
    [inStream atEnd not] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2723
        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2724
        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2725
            labelLineElements := line asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2726
            elements := labelLineElements size.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2727
            elements > 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2728
                label := labelLineElements second withoutSeparators.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2729
                revision := self getRevisionForLabel:label depotPath:depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2730
                tags at:(labelLineElements second withoutSeparators) put:revision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2731
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2732
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2733
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2734
    info at:#symbolicNames put:tags.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2735
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2736
    ^ info
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2737
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2738
    "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
  2739
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2740
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2741
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathsInRepository
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2742
    "set a symbolicName for revision rev.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2743
     If rev is nil, set it for the head (most recent) revision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2744
     If rev is 0, delete the symbolic name.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2745
     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
  2746
     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
  2747
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2748
     If filename is nil, the symbolicName for a whole package is set.
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2749
     If multiple paths are given, the revision MUST be nil."
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2750
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2751
    |argumentString result errorStream moduleDirs symbolicName perforceCommand outputStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2752
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2753
    symbolicName := (symbolicNameArg includes:Character space)
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2754
                        ifTrue:[ '"',symbolicNameArg,'"' ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2755
                        ifFalse:[ symbolicNameArg ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2756
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2757
    pathsInRepository size > 1 ifTrue:[
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2758
        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
  2759
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2760
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2761
    moduleDirs := pathsInRepository
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2762
                    collect:[:pathInRepository |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2763
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2764
                    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2765
    moduleDirs do:[:moduleDir |
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2766
        |pathsInModule pathsInModuleAsArgument|
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2767
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2768
        pathsInModule := pathsInRepository
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2769
                    select:[:pathInRepository |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2770
                        |moduleOfThisPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2771
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2772
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2773
                        moduleOfThisPath = moduleDir
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2774
                    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2775
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2776
        rev = 0 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2777
            argumentString := ' -d '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2778
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2779
            argumentString := ' -r ', (rev ? 'HEAD').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2780
            overWriteBool ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2781
                argumentString := argumentString, ' -F'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2782
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2783
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2784
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2785
        pathsInModuleAsArgument := pathsInModule
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2786
                                        collect:[:eachPath |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2787
                                            (eachPath includes:Character space) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2788
                                                '"',eachPath,'"'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2789
                                            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2790
                                                eachPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2791
                                            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2792
                                        ].
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2793
        pathsInModuleAsArgument := pathsInModuleAsArgument asStringCollection asStringWith:Character space.
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2794
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2795
        self activityNotification:'setting symbolic name for: ', pathsInModuleAsArgument.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2796
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2797
        self information:'Implementation not finished yet'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2798
        ^self.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2799
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2800
        perforceCommand := ('label "' , pathsInRepository, '"').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2801
        outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2802
        errorStream := ReadWriteStream on:''.
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2803
        result := self executePerforceCommand:perforceCommand inDirectory:self root
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2804
            inputFrom:nil outputTo:outputStream
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2805
            errorTo:errorStream
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2806
            logHeader:('set label ', pathsInRepository, '.').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2807
        result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2808
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2809
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2810
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2811
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2812
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2813
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2814
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2815
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2816
     self
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2817
        setSymbolicName:'test1'
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2818
        revision:nil
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2819
        overWrite:true
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2820
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2821
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2822
     self
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2823
        setSymbolicName:'test2'
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2824
        revision:nil
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2825
        overWrite:true
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2826
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2827
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2828
16806
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2829
     self
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2830
        setSymbolicName:'test2'
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2831
        revision:0
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2832
        overWrite:true
1bfd1d1c7fc3 #OTHER by mawalch
mawalch
parents: 16519
diff changeset
  2833
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2834
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2835
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2836
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2837
    "Created: / 12-09-2006 / 12:36:44 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2838
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2839
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2840
streamFor:checkInDefinition revision:revision cache:doCache
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2841
    "extract a classes source code and return an open readStream on it.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2842
     A revision of nil selects the current (in image) revision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2843
     The classes source code is extracted using the revision and the sourceCodeInfo,
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2844
     which itself is extracted from the classes packageString."
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 cacheDir classFileName fullName cachedSourceFilename cacheSubDir cachedFile tempdir checkoutName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2847
     checkoutNameLocal revMsg fullTempName fullCachedName stream tempFile outStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2848
     line modulDir lineNr result outputStream errorStream inStream cls module packageDir packagePath fullFilename perforceCommand|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2849
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2850
    cacheIt := doCache.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2851
    (cacheIt and:[revision ~~ #newest and:[revision notNil]]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2852
        (cacheDir := PerforceSourceCodeManager sourceCacheDirectory) isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2853
            'PerforceSourceCodeManager [warning]: no source cache directory' errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2854
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2855
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2856
    self getTemporaryWorkspaceFor:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2857
    cls := checkInDefinition definitionClass.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2858
    classFileName := checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2859
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2860
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2861
    (classFileName endsWith:',v') ifTrue:[
12702
2759bbb8d06b Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 11959
diff changeset
  2862
        classFileName := classFileName copyButLast:2.
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
    (classFileName endsWith:'.st') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2865
        cls notNil ifTrue:[
12702
2759bbb8d06b Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 11959
diff changeset
  2866
            classFileName := classFileName copyButLast:3.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2867
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2868
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2869
    module :=  checkInDefinition package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2870
    packageDir := checkInDefinition packageDir.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2871
    fullName := module , '/' , packageDir , '/' , classFileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2872
    cls notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2873
        fullName := fullName , '.st'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2874
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2875
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2876
    (revision isNil or:[revision == #newest]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2877
        cachedSourceFilename := classFileName, '_p4'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2878
        revMsg := ''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2879
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2880
        cachedSourceFilename := classFileName , '_p4_' , revision.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2881
        revMsg := ' (' , revision , ')'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2882
    ].                                               
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2883
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2884
    cacheDir notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2885
        cacheSubDir := cacheDir construct:module.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2886
        cacheSubDir := cacheSubDir construct:packageDir.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2887
        cachedFile := cacheSubDir construct:cachedSourceFilename.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2888
        cachedFile exists ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2889
            ^ cachedFile readStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2890
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2891
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2892
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2893
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2894
    "/ first, create a temporary work tree
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2895
    "/ 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
  2896
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2897
    tempdir := self tempDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2898
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2899
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2900
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2901
    "/ check it out there
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2902
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2903
    checkoutName :=  fullName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2904
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2905
    modulDir := module asFilename construct:packageDir.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2906
    checkoutNameLocal := modulDir constructString:(fullName asFilename baseName).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2907
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2908
    self activityNotification:'checking out source ' , checkoutName , revMsg.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2909
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2910
    packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2911
    fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2912
    fullTempName := self getTemporaryFilenameFor:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2913
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2914
    perforceCommand := ('print "' , fullFilename pathName, '#', revision, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2915
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2916
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2917
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2918
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2919
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2920
        logHeader:('get contents of ', fullFilename pathName, ' for revision ', revision, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2921
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2922
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2923
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2924
    errorStream contents notEmpty ifTrue:[
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
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2927
    FileStream openErrorSignal handle:[:ex|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2928
        ('PerforceSourceCodeManager [error]: can not create ', fullTempName pathName) errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2929
        ^ nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2930
    ] do:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2931
        fullTempName directory recursiveMakeDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2932
        outStream := fullTempName writeStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2933
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2934
    lineNr := 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2935
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2936
    [inStream atEnd not] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2937
        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2938
        line notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2939
            lineNr = 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2940
            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2941
                outStream nextPutLine:line.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2942
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2943
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2944
        lineNr := lineNr + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2945
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2946
    outStream close.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2947
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2948
    (cacheSubDir isNil) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2949
        cacheIt := false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2950
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2951
        cacheSubDir recursiveMakeDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2952
        fullCachedName := cacheSubDir constructString:cachedSourceFilename.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2953
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2954
    (cacheIt
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2955
    and:[cachedFile notNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2956
    and:[fullTempName exists]])
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2957
    ifTrue:[
12725
93efe8fda21c class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12702
diff changeset
  2958
        (OsError catch:[
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2959
            fullTempName moveTo:fullCachedName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2960
        ]) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2961
            ('PerforceSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2962
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2963
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2964
        fullCachedName asFilename exists ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2965
            stream := fullCachedName asFilename readStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2966
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2967
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2968
        checkInDefinition fileName = 'extensions.st' ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2969
            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
  2970
        ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2971
            self activityNotification:'Not cached - please check your settings.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2972
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2973
        OperatingSystem isUNIXlike ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2974
            "/ cannot remove files which are still open ...
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2975
            "/ sigh - need a delete-on-close flag in FileStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2976
            "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2977
            tempFile := Filename newTemporary.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2978
            fullTempName copyTo:tempFile.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2979
            stream := tempFile readStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2980
            stream notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2981
                stream removeOnClose:true.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2982
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2983
        ] ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2984
            stream := fullTempName readStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2985
        ]
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2986
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2987
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2988
    ^ stream
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2989
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  2990
    "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
  2991
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2992
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2993
submit
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2994
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2995
    |numbers|
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 := self getCurrentChangeListNumbers.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2998
    numbers isEmptyOrNil ifTrue:[
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
    numbers do:[:aNumber|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3002
        (self submitChangeNumber:aNumber) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3003
            ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3004
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3005
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3006
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3007
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3008
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3009
submitChangeNumber:changeNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3010
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3011
    |cmd outputStream errorStream result changeListDescription infoDialog logMsg|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3012
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3013
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3014
    self temporaryWorkSpace isNil ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3015
	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
  3016
	^false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3017
    ].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3018
    changeListDescription := self getChangeDespriptionInfoFor:changeNumber printString.
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3019
    infoDialog := PerforceSourceCodeManager submitInfoDialogClass
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3020
	    getCheckinInfoFor:'Perforce submit message check'
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3021
	    initialAnswer:((changeListDescription at:#Description ifAbsent:'') copy)
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3022
	    withFileList:(changeListDescription at:#Files ifAbsent:'').
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3023
    infoDialog notNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3024
	logMsg := infoDialog logMessage.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3025
	(changeListDescription at:#Description ifAbsent:'') ~= logMsg asStringCollection ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3026
	    self changeChangeDescriptionTo:logMsg asStringCollection changeNumber:changeNumber printString
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3027
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3028
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3029
    cmd := ('submit -c ', changeNumber printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3030
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3031
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3032
    result := self temporaryWorkSpace executePerforceCommand:cmd
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3033
			inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3034
			inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3035
			outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3036
			errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3037
			doLog:false.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3038
    result ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3039
	result := self mergeOrResolveConflictsForChangeNumber:changeNumber.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3040
	result ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3041
	    cmd := ('submit -c ', changeNumber printString).
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3042
	    outputStream := ReadWriteStream on:''.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3043
	    errorStream := ReadWriteStream on:''.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3044
	    result := self temporaryWorkSpace executePerforceCommand:cmd
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3045
				inDirectory:self tempDirectory
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3046
				inputFrom:nil
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3047
				outputTo:outputStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3048
				errorTo:errorStream
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3049
				logHeader:('submit change ', changeNumber printString, ' after resolve.').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3050
	    result ifFalse:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3051
		^ false
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3052
	    ].
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3053
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3054
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3055
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3056
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3057
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3058
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'basic administration'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3059
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3060
initialRevisionInfo:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3061
    "return a string usable as initial revision string"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3062
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3063
    |version workSpace foundView packagePath fullFilename depotPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3064
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3065
    checkInDefinition definitionClass isPrivate ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3066
        PerforceSourceCodeManager reportError:'refuse to get revision for private classes.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3067
        ^ nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3068
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3069
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3070
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3071
    "/ first, create a temporary work tree
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3072
    "/
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3073
"/    tempdir := checkInDefinition tempDirectory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3074
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3075
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3076
    workSpace := PerforceSourceCodeManager getWorkSpaceForPackage:(checkInDefinition packageString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3077
    workSpace isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3078
        ('PerforceSourceCodeManager [error]: failed to create workspace for', checkInDefinition definitionObjectString)  errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3079
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3080
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3081
    checkInDefinition workSpace:workSpace.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3082
    version := PerforceSourceCodeManager versionInfoClass new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3083
    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
  3084
    packagePath := Smalltalk getPackageDirectoryForPackage:checkInDefinition package.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3085
    fullFilename := (packagePath construct:checkInDefinition packageDir) construct:checkInDefinition fileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3086
    depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3087
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3088
    version repositoryPathName:depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3089
    version user:workSpace owner.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3090
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3091
    s := CharacterWriteStream on:(String basicNew:40).    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3092
    Date today printOn:s format:'%d-%m-%y' language:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3093
    version date:s contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3094
    s := CharacterWriteStream on:(String basicNew:40).    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3095
    Timestamp now printOn:s format:'%h-%m-%s.%i'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3096
    version time:s contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3097
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3098
    version revision:'1'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3099
    ^ version.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3100
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3101
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3102
self initialRevisionStringFor:RTDBInspectorStartup inModule:'applistx' directory:'util/rtdb' container:'RTDBInterfaceInspector.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3103
"
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3104
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3105
    "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
  3106
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3107
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3108
initialRevisionStringFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3109
    "return a string usable as initial revision string"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3110
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3111
    |info|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3112
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3113
    info := self initialRevisionInfo:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3114
    info notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3115
        ^info getVersionString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3116
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3117
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3118
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3119
self initialRevisionStringFor:RTDBInspectorStartup inModule:'applistx' directory:'util/rtdb' container:'RTDBInterfaceInspector.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3120
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3121
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3122
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3123
nextRevisionStringFor:checkInDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3124
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3125
    |versionInfo s newestRevisionNumber versionMethod versionString|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3126
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3127
    versionMethod := checkInDefinition definitionClass findVersionMethodOfManager:PerforceSourceCodeManager.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3128
    versionMethod notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3129
        versionString := (versionMethod valueWithReceiver:(checkInDefinition definitionClass theNonMetaclass) arguments:#()).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3130
        versionString notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3131
            versionInfo := PerforceSourceCodeManager versionInfoClass fromRCSString:versionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3132
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3133
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3134
    versionInfo isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3135
        versionInfo := self initialRevisionInfo:checkInDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3136
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3137
        versionInfo user:checkInDefinition workSpace owner.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3138
        s := CharacterWriteStream on:(String basicNew:40).    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3139
        Date today printOn:s format:'%d-%m-%y' language:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3140
        versionInfo date:s contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3141
        s := CharacterWriteStream on:(String basicNew:40).    
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3142
        Timestamp now printOn:s format:'%h-%m-%s.%i'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3143
        versionInfo time:s contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3144
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3145
    versionInfo 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
    newestRevisionNumber := checkInDefinition getReposRevisionNumberBeforeCheckin.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3149
    newestRevisionNumber isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3150
        ^nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3151
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3152
    versionInfo revision:((newestRevisionNumber + 1) printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3153
    ^versionInfo getVersionString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3154
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3155
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3156
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'command execution'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3157
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3158
executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3159
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3160
        errorTo:errorStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3161
    "execute command and prepend perforce command name and global options.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3162
     execute command in the dirArg directory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3163
     The doLog argument, if false supresses a logEntry to be added
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3164
     in the cvs log file (used when reading / extracting history)"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3165
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3166
    ^self executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3167
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3168
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3169
        doLog:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3170
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3171
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3172
executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3173
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3174
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3175
        doLog:doLog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3176
    "execute command and prepend perforce command name and global options.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3177
     execute command in the dirArg directory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3178
     The doLog argument, if false supresses a logEntry to be added
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3179
     in the cvs log file (used when reading / extracting history)"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3180
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3181
    ^self executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3182
            inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3183
            errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3184
            doLog:doLog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3185
            logHeader:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3186
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3187
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3188
executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3189
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3190
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3191
        doLog:doLog
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3192
        logHeader:logHeader
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3193
    "execute command and prepend perforce command name and global options.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3194
     execute command in the dirArg directory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3195
     The doLog argument, if false supresses a logEntry to be added
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3196
     in the cvs log file (used when reading / extracting history)"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3197
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3198
    |command rslt pathOfDir errorString  timeout errorMsgStream executeStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3199
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3200
    dirArg notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3201
        pathOfDir := dirArg asFilename pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3202
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3203
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3204
    command := self getCommandOptionsForCommand:perforceCommand.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3205
    Processor isDispatching ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3206
        rslt := OperatingSystem executeCommand:command
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3207
                        inputFrom:inputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3208
                        outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3209
                        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3210
                        auxFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3211
                        inDirectory:pathOfDir
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3212
                        lineWise:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3213
                        onError:[:status| false].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3214
    ] ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3215
        PerforceCommandSemaphore critical:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3216
            |p |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3217
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3218
            p := [
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3219
                rslt := OperatingSystem executeCommand:command
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3220
                                inputFrom:inputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3221
                                outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3222
                                errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3223
                                auxFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3224
                                inDirectory:pathOfDir
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3225
                                lineWise:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3226
                                onError:[:status| false].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3227
            ] fork.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3228
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3229
            timeout := (p waitUntilTerminatedWithTimeout:300). 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3230
            timeout ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3231
                ('PerforceSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3232
                rslt := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3233
                errorString := 'Perforce command timeout'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3234
            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3235
                rslt ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3236
                    errorString := ('PerforceSourceCodeManager [info]: command failed: ' , command).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3237
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3238
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3239
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3240
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3241
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3242
    PerforceSourceCodeManager verboseSourceCodeAccess == true ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3243
        executeStream := WriteStream on:''.
13926
70a1af3d7b8e AbsoluteTime -> Timestamp
Stefan Vogel <sv@exept.de>
parents: 13823
diff changeset
  3244
        executeStream nextPutAll:Timestamp now printString.
11532
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:('Command <', command, '>').
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:('StdErr Output: <', errorStream contents, '>').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3249
        executeStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3250
        executeStream nextPutAll:('StdOut Output: <', outputStream contents, '>').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3251
        executeStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3252
        executeStream nextPutAll:('##############################').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3253
        Transcript showCR:executeStream contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3254
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3255
    rslt ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3256
        doLog ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3257
            errorMsgStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3258
            logHeader notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3259
                errorMsgStream nextPutAll:'Error '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3260
                errorMsgStream nextPutAll:logHeader.
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
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3263
            timeout ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3264
                errorMsgStream nextPutAll:('Timeout command <', command, '>').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3265
                errorMsgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3266
            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3267
                errorMsgStream nextPutAll:('Command <', command, '>').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3268
                errorMsgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3269
                errorMsgStream nextPutAll:('Error output: ', errorStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3270
                outputStream contents notEmpty ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3271
                    errorMsgStream nextPutAll:('Output: ', outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3272
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3273
            ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3274
            self perforceError raiseErrorString:errorMsgStream contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3275
            SourceCodeManagerError isHandled ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3276
                SourceCodeManagerError raiseErrorString:errorMsgStream contents.
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
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3280
    ^ rslt.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3281
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3282
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3283
executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3284
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3285
        errorTo:errorStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3286
        logHeader:logHeader
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3287
    "execute command and prepend perforce command name and global options.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3288
     execute command in the dirArg directory.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3289
     The doLog argument, if false supresses a logEntry to be added
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3290
     in the cvs log file (used when reading / extracting history)"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3291
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3292
    ^self executePerforceCommand:perforceCommand inDirectory:dirArg 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3293
        inputFrom:inputStream outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3294
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3295
        doLog:true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3296
        logHeader:logHeader.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3297
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3298
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3299
getCommandOptionsForCommand:perforceCommand
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3300
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3301
    |commandStream executable port user password clientString|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3302
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3303
    commandStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3304
    executable := PerforceSourceCodeManager perforceExecutable.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3305
    (executable includes:Character space) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3306
        commandStream nextPut:$".
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3307
        commandStream nextPutAll:executable.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3308
        commandStream nextPut:$".
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3309
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3310
        commandStream nextPutAll:executable.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3311
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3312
    commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3313
    port := self perforceSettings at:#port ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3314
    port notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3315
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3316
        commandStream nextPutAll:'-p '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3317
        commandStream nextPutAll:port.
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
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3320
    clientString := self perforceSettings at:#client ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3321
    clientString notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3322
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3323
        commandStream nextPutAll:'-c '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3324
        commandStream nextPutAll:clientString.
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
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3327
    user := self perforceSettings at:#user ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3328
    user notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3329
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3330
        commandStream nextPutAll:'-u '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3331
        commandStream nextPutAll:user.
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
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3334
    password := self perforceSettings at:#password ifAbsent:nil.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3335
    password notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3336
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3337
        commandStream nextPutAll:'-P '.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3338
        commandStream nextPutAll:password.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3339
        commandStream space.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3340
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3341
    commandStream nextPutAll:perforceCommand.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3342
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3343
    ^ commandStream contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3344
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3345
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3346
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'dialogs & helpers'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3347
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3348
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3349
    "trouble checking in - open a dialog"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3350
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3351
    ^ self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3352
        checkinTroubleDialog:title
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3353
        message:message
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3354
        log:log
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3355
        abortable:abortable
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3356
        option:optionTitle
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3357
        option2:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3358
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3359
    "Created: 10.12.1995 / 17:34:33 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3360
    "Modified: 12.9.1996 / 02:39:06 / cg"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3361
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3362
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3363
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3364
    ^self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3365
        checkinTroubleDialog:title
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3366
        message:message
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3367
        log:log
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3368
        abortable:abortable
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3369
        option:optionTitle
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3370
        option2:optionTitle2
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3371
        option3:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3372
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3373
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3374
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
  3375
    "trouble checking in - open a dialog"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3376
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3377
    |l box list listView optionPressed option2Pressed option3Pressed|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3378
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3379
    l := log collect:[:line | line withTabsExpanded].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3380
    list := SelectionInList with:l.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3381
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3382
    box := Dialog new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3383
    box label:(title).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3384
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3385
    (box addTextLabel:message) borderWidth:0.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3386
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3387
    l asString notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3388
        listView := SelectionInListView on:list.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3389
        listView disable.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3390
        listView height:(listView heightOfContents max:250).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3391
        box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3392
        box addVerticalSpace.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3393
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3394
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3395
    abortable ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3396
        box addAbortButton
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3397
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3398
    optionTitle notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3399
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3400
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3401
    optionTitle2 notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3402
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3403
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3404
    optionTitle3 notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3405
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3406
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3407
    box addOkButton.
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 extent:(box preferredExtent).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3410
    box minExtent:box extent.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3411
    box maxExtent:box extent.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3412
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3413
    box open.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3414
    box destroy.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3415
    optionPressed == true ifTrue:[^ #option].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3416
    option2Pressed == true ifTrue:[^ #option2].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3417
    option3Pressed == true ifTrue:[^ #option3].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3418
    ^ box accepted
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3419
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3420
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3421
| changesAsLogged |
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
1 to:10 do:[:each|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3424
    changesAsLogged add:('Hallo', each printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3425
].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3426
changesAsLogged := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3427
self checkinTroubleDialog:'Version conflict'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3428
             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
  3429
             log:changesAsLogged
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3430
             abortable:false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3431
             option:'show conflicts'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3432
             option2:'resolve conflicts'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3433
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3434
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3435
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3436
diffTextComment
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3437
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3438
    |ws|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3439
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3440
    ws := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3441
    ws nextPutLine:'"/ ***************************************************************'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3442
    ws nextPutLine:'"/ This text contains your current versions code (blue)'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3443
    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
  3444
    ws nextPutLine:'"/ from some other checkin.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3445
    ws nextPutLine:'"/ Each such conflict is surrounded by green text (like this paragraph).'.
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 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
  3448
    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
  3449
    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
  3450
    ws nextPutLine:'"/ ***************************************************************'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3451
    ^ ws contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3452
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3453
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3454
getRevisionForLabel:label depotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3455
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3456
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3457
    |perforceCommand outputStream errorStream result inStream line depotAndRevision|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3458
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3459
    perforceCommand := ('files "@' , label, '"').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3460
    outputStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3461
    errorStream := ReadWriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3462
    result := self executePerforceCommand:perforceCommand inDirectory:self root 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3463
        inputFrom:nil outputTo:outputStream 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3464
        errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3465
        logHeader:('getting revision for label ', label, '.').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3466
    result ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3467
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3468
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3469
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3470
    [inStream atEnd not] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3471
        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3472
        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3473
            (line startsWith:depotPath) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3474
                depotAndRevision := line asCollectionOfWords first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3475
                depotAndRevision := depotAndRevision asCollectionOfSubstringsSeparatedBy:$#.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3476
                ^ depotAndRevision second
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
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3480
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3481
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3482
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3483
messageForChangesInClass:class revision:revisionNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3484
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3485
    |msgStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3486
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3487
    msgStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3488
    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
  3489
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3490
    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
  3491
    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
  3492
    msgStream nextPutAll:'into a new common revision which may be different from both.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3493
    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
  3494
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3495
    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
  3496
    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
  3497
    msgStream nextPutAll:'change methods as required and check in again.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3498
    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
  3499
    msgStream nextPutAll:'and you should update your class from the repository.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3500
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3501
    msgStream nextPutAll:'Continue ?'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3502
    ^ msgStream contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3503
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3504
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3505
messageForConflictsInClass:definitionClass revision:revisionNumber
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3506
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3507
    |msgStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3508
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3509
    msgStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3510
    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
  3511
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3512
    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
  3513
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3514
    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
  3515
    msgStream nextPutAll:'and change your methods avoiding conflicts. The checkin again.'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3516
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3517
    ^ msgStream contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3518
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3519
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3520
messageForNoChangesInClass:class
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3521
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3522
    |msgStream|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3523
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3524
    msgStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3525
    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
  3526
    msgStream cr.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3527
    msgStream nextPutAll:'I have merged your version with the newest repository version,'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3528
    msgStream nextPutAll:'and found no differences between the result and your current version'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3529
    msgStream nextPutAll:'(i.e. your version seemed up-to-date).'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3530
    ^ msgStream contents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3531
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3533
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3534
    "update a revision string"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3535
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3536
    |versionInfo packageID module foundView packagePath fullFilename depotPath sourceInfo classFileName|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3537
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3538
    originalVersionString isEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3539
        packageID := PackageId from:aClass package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3540
        module := packageID module.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3541
        foundView := self getViewForPackage:module.
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3542
        packagePath := Smalltalk getPackageDirectoryForPackage:module.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3543
        sourceInfo := PerforceSourceCodeManager sourceInfoOfClass:aClass.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3544
        sourceInfo isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3545
            PerforceSourceCodeManager reportError:('no sourceInfo for class: ' , aClass name).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3546
            ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3547
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3548
        classFileName := PerforceSourceCodeManager containerFromSourceInfo:sourceInfo.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3549
        fullFilename := (packagePath construct:packageID directory) construct:classFileName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3550
        depotPath := foundView getDepotPathForLocalPath:fullFilename pathName.
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 := PerforceSourceCodeManager versionInfoClass fromRepositoryPathName:depotPath.        
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3553
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3554
        versionInfo := PerforceSourceCodeManager versionInfoClass fromRCSString:originalVersionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3555
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3556
    versionInfo revision:newRevision printString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3557
    ^ versionInfo getVersionString.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3558
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3559
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3560
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3561
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3562
    self updatedRevisionStringOf:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3563
            forRevision:'6'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3564
            with:'$','Header','$'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3565
"
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3566
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3567
    "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
  3568
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3569
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3570
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'initialization'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3571
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3572
initialize
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3573
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3574
    PerforceCommandSemaphore := Semaphore new:10.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3575
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3576
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3577
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'queries'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3578
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3579
getDepotPathForLocalPath:aFilename
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3580
    |view|
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 := self getViewForPath:aFilename.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3583
    view isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3584
        ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3585
    ].             
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3586
    ^view getDepotPathForLocalPath:aFilename
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3587
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3588
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3589
getLocalPathForDepotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3590
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3591
    |view|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3592
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3593
    view := self getViewForDepotPath:depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3594
    view notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3595
        ^view getLocalPathForDepotPath:depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3596
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3597
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3598
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3599
     | workSpace tempWorkSpace |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3600
    workSpace := PerforceSourceCodeManager getWorkSpaceForPackage:'applistx'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3601
    tempWorkSpace := workSpace temporaryWorkSpace.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3602
    tempWorkSpace getLocalPathForDepotPath:'//depot/applistx/util/libDataType/ActionLQualifier.st'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3603
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3604
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3605
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3606
getTemporaryFilenameFor:aFilename
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3607
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3608
    |myView checkInPart fullTempFilename|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3609
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3610
    myView := self getViewForPath:aFilename.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3611
    self temporaryWorkSpace isNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3612
	self perforceError raiseErrorString:('Error getting temporary workspace when try to get temporaryFilename.').
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3613
	^nil.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3614
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3615
    self temporaryWorkSpace views do:[:aView|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3616
	myView depot = aView depot ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3617
	    checkInPart := PerforceSourceCodeManager getTrailungPathNameFrom:aFilename with:myView localPathName.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3618
	    fullTempFilename := aView localPathName asFilename construct:checkInPart.
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3619
	    ^fullTempFilename
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3620
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3621
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3622
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3623
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3624
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3625
getTemporaryViewForPackage:aPackage
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3626
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3627
    |myView|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3628
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3629
    myView := self getViewForPackage:aPackage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3630
    self temporaryWorkSpace isNil ifTrue:[
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3631
	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
  3632
	^nil.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3633
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3634
    self temporaryWorkSpace views do:[:aView|
12893
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3635
	myView depot = aView depot ifTrue:[
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3636
	    ^ aView
61328b650b79 class: PerforceSourceCodeManagerUtilities
Claus Gittinger <cg@exept.de>
parents: 12725
diff changeset
  3637
	].
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3638
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3639
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3640
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3641
getViewForDepotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3642
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3643
    |myHostName|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3644
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3645
    myHostName := OperatingSystem getHostName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3646
    (myHostName endsWith:OperatingSystem getDomainName) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3647
        myHostName := myHostName copyTo:(myHostName size - (OperatingSystem getDomainName size + 1)).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3648
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3649
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3650
    (myHostName asLowercase startsWith:(self host asLowercase)) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3651
        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
  3652
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3653
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3654
    self views do:[:aView |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3655
        (aView hasViewForDepotPath:depotPath) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3656
            ^aView
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
    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
  3660
    ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3661
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3662
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3663
getViewForPackage:aPackage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3664
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3665
    |locPackage packagePath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3666
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3667
    aPackage isNil ifTrue:[                              
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3668
        locPackage := Smalltalk package.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3669
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3670
        locPackage := aPackage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3671
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3672
    packagePath := self packageDirectoryForPackageId:locPackage.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3673
    packagePath notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3674
        packagePath := packagePath pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3675
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3676
        self perforceError raiseErrorString:('no package path for ', aPackage printString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3677
        ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3678
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3679
    ^self getViewForPath:packagePath
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
    PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applistx:application/rtdbInspector/builder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3683
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3684
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3685
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3686
getViewForPath:aPathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3687
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3688
    |myHostName|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3689
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3690
    myHostName := OperatingSystem getHostName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3691
    (myHostName endsWith:OperatingSystem getDomainName) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3692
        myHostName := myHostName copyTo:(myHostName size - (OperatingSystem getDomainName size + 1)).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3693
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3694
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3695
    (myHostName asLowercase startsWith:(self host asLowercase)) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3696
        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
  3697
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3698
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3699
    self views do:[:aView |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3700
        (aView hasViewForPath:aPathName) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3701
            ^aView
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
    self perforceError raiseErrorString:('Client ', (perforceSettings at:#client), ' have no View for path ', aPathName).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3705
    ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3706
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3707
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3708
hasViewForPackage:aPackage 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3709
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3710
    ^(self getViewForPackage:aPackage) notNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3711
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3712
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3713
hasViewForPath:aPathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3714
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3715
    ^(self getViewForPath:aPathName) notNil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3716
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3717
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3718
packageDirectoryForPackageId:package
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3719
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3720
    ^self packageDirectoryForPackageId:package checkParents:true
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
    PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applisddtx:application/rtdbInspector/builder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3724
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3725
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3726
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3727
packageDirectoryForPackageId:package checkParents:checkParents
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3728
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3729
    |locPackage packagePath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3730
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3731
    locPackage := package copyReplaceAll:$: with:$/.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3732
    [ packagePath isNil ] whileTrue:[
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3733
        packagePath := Smalltalk getPackageDirectoryForPackage:locPackage.
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3734
        packagePath notNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3735
            ^packagePath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3736
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3737
        locPackage := locPackage asFilename directoryName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3738
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3739
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3740
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3741
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3742
    PerforceSourceCodeManager perforceWorkspaces first value getViewForPackage:'applisddtx:application/rtdbInspector/builder'
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3743
"
16717
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3744
814e3fa20205 Issue 98: Use #getPackageDirectoryForPackage: instead of #packageDirectoryForPackageId:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 16571
diff changeset
  3745
    "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
  3746
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3747
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3748
perforceError
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3749
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3750
    ^ PerforceSourceCodeManager perforceError
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3751
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3752
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3753
perforceSettingsString
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3754
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3755
    ^ PerforceSourceCodeManager getStringFromPerforceSettings:self perforceSettings
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3756
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3757
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3758
readRevisionLogEntryFromStream:inStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3759
    "read and parse a single revision info-entry from the cvs log output.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3760
     Return nil on end.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3761
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3762
     The returned information is a structure (IdentityDictionary)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3763
     filled with:
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3764
              #revision              -> the revision string
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3765
              #author                -> who checked that revision into the repository
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3766
              #date                  -> when was it checked in
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3767
              #state                 -> the RCS state
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3768
              #logMessage            -> the checkIn log message
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3769
    "
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 atEnd|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3772
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3773
    atEnd := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3774
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3775
    revLine1 := inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3776
    ^ self readRevisionLogEntryFromString:revLine1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3777
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3778
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3779
readRevisionLogEntryFromString:revLine1
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3780
    "read and parse a single revision info-entry from the cvs log output.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3781
     Return nil on end.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3782
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3783
     The returned information is a structure (IdentityDictionary)
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3784
     filled with:
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3785
              #revision              -> the revision string
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3786
              #author                -> who checked that revision into the repository
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3787
              #date                  -> when was it checked in
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3788
              #state                 -> the RCS state
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3789
              #logMessage            -> the checkIn log message
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3790
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3791
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3792
    | record revisionLineElements noOfRevisionLineElements posText|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3793
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3794
    (revLine1 notNil) ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3795
        record := IdentityDictionary new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3796
        revisionLineElements := revLine1 asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3797
        noOfRevisionLineElements := revisionLineElements size.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3798
        noOfRevisionLineElements > 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3799
            record at:#revision put:((revisionLineElements at:2) copyFrom:2).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3800
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3801
        noOfRevisionLineElements > 8 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3802
            record at:#author put:(revisionLineElements at:9).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3803
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3804
        noOfRevisionLineElements > 6 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3805
            record at:#date put:(revisionLineElements at:7).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3806
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3807
        noOfRevisionLineElements > 4 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3808
            record at:#state put:(revisionLineElements at:5).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3809
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3810
        noOfRevisionLineElements > 10 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3811
            posText := 0.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3812
            1 to:9 do:[:ele| posText := posText + (revisionLineElements at:ele) size + 1].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3813
            record at:#logMessage put:(revLine1 copyFrom:posText).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3814
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3815
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3816
    ^record.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3817
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3818
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3819
temporaryClientName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3820
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3821
    ^ 'stxCheckinWorkSpace_', self owner, self host.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3822
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3823
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3824
!PerforceSourceCodeManagerUtilities::WorkSpace methodsFor:'read'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3825
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3826
getDefinitionFromServer
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3827
    |cmd myBaseDirectory outputStream errorStream rslt clients inStream line words|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3828
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3829
    cmd := 'clients -u ' , (self perforceSettings at:#user).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3830
    myBaseDirectory := (Filename currentDirectory asAbsoluteFilename) pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3831
    outputStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3832
    errorStream := WriteStream on:''.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3833
    rslt := self  
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3834
                executePerforceCommand:cmd
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3835
                inDirectory:myBaseDirectory
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3836
                inputFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3837
                outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3838
                errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3839
                logHeader:('getting workspaces ').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3840
    rslt ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3841
        self perforceError raiseErrorString:(outputStream contents, errorStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3842
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3843
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3844
    clients := OrderedCollection new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3845
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3846
    [ inStream atEnd not ] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3847
        line := inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3848
        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3849
            words := line asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3850
            words size > 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3851
                clients add:(words at:2).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3852
            ].
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
    (clients includes:(self perforceSettings at:#client ifAbsent:nil)) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3856
        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
  3857
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3858
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3859
    cmd := 'client -o'.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3860
    myBaseDirectory := (Filename currentDirectory asAbsoluteFilename) pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3861
    outputStream reset.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3862
    errorStream reset.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3863
    rslt := self 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3864
                executePerforceCommand:cmd
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3865
                inDirectory:myBaseDirectory
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3866
                inputFrom:nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3867
                outputTo:outputStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3868
                errorTo:errorStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3869
                logHeader:('getting empty workspace definition ').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3870
    rslt ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3871
        self perforceError raiseErrorString:(outputStream contents, errorStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3872
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3873
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3874
    inStream := ReadStream on:(outputStream contents).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3875
    self getWorkSpaceFromClientSpecFrom:inStream.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3876
    ^true
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
(PerforceSourceCodeManager getWorkSpaceForPackage:'applistx') getDefinitionFromServer
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3880
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3881
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3882
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3883
getWorkSpaceFromClientSpecFrom:inStream
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3884
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3885
        get the workspace definition from perforce client command output
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3886
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3887
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3888
    |line nextKey |
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3889
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3890
    [inStream atEnd not] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3891
        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3892
        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3893
                line first = $# ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3894
                (line startsWith:'Owner:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3895
                    self owner:line asCollectionOfWords second.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3896
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3897
                (line startsWith:'Host:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3898
                    self host:line asCollectionOfWords second.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3899
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3900
                (line startsWith:'Client:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3901
                    self client:(line asCollectionOfWords second).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3902
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3903
                (line startsWith:'Root:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3904
                    self root:((line copyFrom:('Root:' size + 1)) withoutLeadingSeparators).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3905
                ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3906
                (line startsWith:'View:') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3907
                    nextKey := false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3908
                    [nextKey not and:[inStream atEnd not]] whileTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3909
                        line:= inStream nextLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3910
                        line notEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3911
                            line first isSeparator ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3912
                                self views add:(View newFromLine:line workspace:self).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3913
                            ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3914
                                nextKey := true.
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
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3921
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3922
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3923
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3924
newWorkSpaceFor:settingsString 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3925
    settingsString isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3926
        ^ nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3927
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3928
    self perforceSettings:(PerforceSourceCodeManager 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3929
                getPerforceSettingsFromString:settingsString).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3930
    self getDefinitionFromServer ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3931
        ^self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3932
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3933
    ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3934
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3935
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3936
newWorkSpaceForSettings:settingsDict 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3937
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3938
    settingsDict isNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3939
        self perforceError raiseErrorString:('nil settings when creating workspace').
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3940
        ^ self
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3941
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3942
    self perforceSettings:settingsDict.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3943
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3944
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3945
!PerforceSourceCodeManagerUtilities::WorkSpace::View class methodsFor:'instance creation'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3946
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3947
newFromLine:aLine workspace:aWorkspaceDefinition
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3948
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3949
    |instance|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3950
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3951
    instance := self new.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3952
    instance newFromLine:aLine.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3953
    instance workspace:aWorkspaceDefinition.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3954
    ^instance
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3955
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3956
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3957
!PerforceSourceCodeManagerUtilities::WorkSpace::View methodsFor:'accessing'!
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3960
    ^ depot
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
depot:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3964
    depot := something.
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3968
    ^ local
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
local:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3972
    local := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3973
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3974
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3975
type
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3976
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3977
    " there special types for views 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3978
      + for added to the same directory
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3979
      - exclude this view
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3980
        and standard view
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3981
    "
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3982
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3983
    ^ type
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
type:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3987
    type := something.
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
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3991
    ^ workspace
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
workspace:something
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3995
    workspace := something.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3996
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3997
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3998
!PerforceSourceCodeManagerUtilities::WorkSpace::View methodsFor:'queries'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  3999
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4000
getDepotPathForLocalPath:aFilename
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4001
    |depotPath restPath unixRestPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4002
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4003
    (self hasViewForPath:aFilename) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4004
        ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4005
    ].                     
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
    (depot endsWith:'...') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4008
        depotPath := depot copyTo:(depot size - 3).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4009
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4010
        depotPath := depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4011
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4012
    restPath := PerforceSourceCodeManager getTrailungPathNameFrom:aFilename with:self localPathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4013
    unixRestPath := (UnixFilename fromComponents:(restPath asFilename components)) pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4014
    depotPath := depotPath, unixRestPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4015
    ^depotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4016
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4017
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4018
getLocalPathForDepotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4019
    |viewDepotPath restPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4020
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4021
    (self hasViewForDepotPath:depotPath) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4022
        ^nil
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4023
    ].                     
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
    (depot endsWith:'...') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4026
        viewDepotPath := depot copyTo:(depot size - 3).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4027
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4028
        viewDepotPath := depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4029
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4030
    restPath := PerforceSourceCodeManager getTrailungPathNameFrom:depotPath with:viewDepotPath.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4031
    ^ (self localPathName asFilename construct:restPath) pathName.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4032
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4033
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4034
hasViewForDepotPath:depotPath
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4035
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4036
    |viewDepotPath|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4037
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4038
    depotPath isEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4039
        ^ false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4040
    ].
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
    (depot endsWith:'...') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4043
        viewDepotPath := depot copyTo:(depot size - 3).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4044
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4045
        viewDepotPath := depot.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4046
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4047
    (PerforceSourceCodeManager path:depotPath hasSamePrefixLikePath:viewDepotPath) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4048
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4049
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4050
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4051
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4052
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4053
hasViewForPath:aPathname
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4054
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4055
    aPathname isEmptyOrNil ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4056
        ^ false.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4057
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4058
    (PerforceSourceCodeManager path:aPathname hasSamePrefixLikePath:self localPathName) ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4059
        ^false
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4060
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4061
    ^true
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4062
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4063
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4064
localPathName
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4065
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4066
    |indexOfClientString localPathName|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4067
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4068
    (local endsWith:'...') ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4069
        localPathName := local copyTo:(local size -3).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4070
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4071
        localPathName := local.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4072
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4073
    indexOfClientString := local findString:workspace client.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4074
    indexOfClientString == 0 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4075
        ^workspace root.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4076
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4077
    localPathName := workspace root asFilename construct:(localPathName copyFrom:(indexOfClientString + workspace client size)).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4078
    ^localPathName pathName 
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4079
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4080
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4081
!PerforceSourceCodeManagerUtilities::WorkSpace::View methodsFor:'reading'!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4082
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4083
newFromLine:aLine
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4084
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4085
    |words firstIndex secondIndex theLine|
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4086
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4087
    theLine := aLine withoutLeadingSeparators.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4088
    theLine := theLine withoutTrailingSeparators.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4089
    theLine isEmpty ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4090
        ^self
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 first == $- ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4097
        type := #-.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4098
        theLine := theLine copyFrom:2.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4099
    ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4100
    (theLine includes:$") ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4101
        "oops we have space directories search for quotes"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4102
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4103
        firstIndex := theLine indexOf:$" startingAt:1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4104
        firstIndex == 1 ifTrue:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4105
            secondIndex := theLine indexOf:$" startingAt:firstIndex + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4106
            depot := theLine copyFrom:firstIndex + 1 to:secondIndex - 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4107
            firstIndex := theLine indexOf:$" startingAt:secondIndex + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4108
            secondIndex := theLine indexOf:$" startingAt:firstIndex + 1.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4109
            local := theLine copyFrom:firstIndex + 1  to:secondIndex - 1.
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
            depot := (theLine copyTo:firstIndex - 1) withoutTrailingSeparators.            
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4112
            local := theLine copyFrom:firstIndex + 1 to:(theLine size - 1).
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4113
        ].
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4114
    ] ifFalse:[
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4115
        words := theLine asCollectionOfWords.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4116
        depot := words first.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4117
        local := words second.
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
    View newFromLine:ws contents.
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4122
"
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4123
! !
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4124
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4125
!PerforceSourceCodeManagerUtilities class methodsFor:'documentation'!
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
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
!
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4130
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4131
version_CVS
16059
8554ef657db3 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 15020
diff changeset
  4132
    ^ '$Header$'
11532
95ad3fcbda8b initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  4133
! !
12702
2759bbb8d06b Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 11959
diff changeset
  4134