CVSSourceCodeManager.st
author Stefan Vogel <sv@exept.de>
Wed, 22 Feb 2006 23:07:08 +0100
changeset 1457 8383e94050aa
parent 1451 561003a458bb
child 1459 83c50df5be7f
permissions -rw-r--r--
Use cvs rlog and cvs rls to avoid temp directory creation Fetch symbolic name info.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     1
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     2
 COPYRIGHT (c) 1995 by Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     3
              All Rights Reserved
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     4
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     5
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     6
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     8
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
     9
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    10
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    11
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    12
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    13
"{ Package: 'stx:libbasic3' }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    14
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    15
AbstractSourceCodeManager subclass:#CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    16
	instanceVariableNames:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    17
	classVariableNames:'Verbose CVSRoot CVSWorkDirectory RemoteCVS CVSBinDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    18
		CVSModuleRoots CMD_checkout CVSTempDir DisabledModules'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    19
	poolDictionaries:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    20
	category:'System-SourceCodeManagement'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    21
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    22
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    23
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    24
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    25
copyright
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    26
"
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    27
 COPYRIGHT (c) 1995 by Claus Gittinger
807
f84a9377278e Fix .stxCvsDummy / import stuff.
Stefan Vogel <sv@exept.de>
parents: 806
diff changeset
    28
              All Rights Reserved
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    29
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    30
 This software is furnished under a license and may be used
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    31
 only in accordance with the terms of that license and with the
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    32
 inclusion of the above copyright notice.   This software may not
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    33
 be provided or otherwise made available to, or used by, any
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    34
 other person.  No title to or ownership of the software is
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    35
 hereby transferred.
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
    36
"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    37
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    38
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    39
documentation
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    40
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    41
    SourceCodeManager which accesses the sourcecode through cvs.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    42
    It requires the shell environment variable CVSROOT to be set
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    43
    to the top of the repository tree. (or alternatively, the CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    44
    variable being set by a private.rc file).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    45
    Under that top, for each module (especially the stx module itself), 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    46
    a subdirectory containing that modules directories must exist.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    47
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    48
    If not specified otherwise, the module defaults to 'stx'. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    49
    If a class has its home in another module, it has to be compiled
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    50
    with a corresponding entry in the package string (see below).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    51
    Within a module, classes are organized in classlibraries, and the corresponding
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    52
    source code is found in various subdirectories of CVSROOT. The directories
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    53
    name can also be provided by the package string - if not, it defaults to the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    54
    libraries name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    55
    The package string controls all this, and is REQUIRED in order for the sourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    56
    to be able to retrieve a classes source.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    57
    The package strings format is:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    58
        '...any infotext....(sourceCodeInfo)'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    59
    the sourceCOdeInfo consists of multiple entries, separated by colons.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    60
    The following formats are allowed:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    61
        (libraryName)                   - module defaults to 'stx'; directory to the name of the library
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    62
        (foo/bar/x)                     - module defaults to 'stx'; dir is 'foo/bar/x'; library name defaults to x
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    63
        (module:directory:libname)      - specifies all components
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    64
    The first formats are intermediate, for backward compatibility. We urge everyone
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    65
    to use the last format (by changing the Make.proto files and add a -P flag to
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    66
    the stc compiler flags (see libbasic/Make.proto as an example).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    67
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    68
    Notice, that the sourceCodeManager is (currently) only consulted, if no
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    69
    source subdirectory exists, or no source file is found there. If it does exist,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    70
    that one is supposed to contain an up-to-date version of the classes source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    71
    (this is temporary - in the future the probe order will be reversed, trying
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    72
     the source repository first).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    73
    The source directory is required for systems which do NO source code control.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    74
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    75
    Setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    76
        - make certain, that the commands 'cvs' and 'co' are available on your system.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    77
        - add setup for the CVSROOT environment variable to your .bashrc / .login / .profile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    78
        - Make certain that either no local source directory exists, or it is empty or it contains
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    79
          only source code for files NOT found in the repository (this will not be required in future versions).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    80
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    81
    Caveat:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    82
        currently, the rcs container is accessed directly, since cvs mangles the files ident-string and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    83
        thus does not correctly recreate the original file (all source is offset by some characters w.r.t. the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    84
        compiled file).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    85
        Therefore, sevrer-mode CVS is not supported.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    86
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    87
    [class variables:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    88
        CVSTempDir      <String | nil>  where a directory tree is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    89
                                        generated temporarily for checkin/checkout
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
    90
                                        (default is nil -> systems tmp-dir)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    91
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    92
        CVSRoot         <String>        the CVS root. Imported from the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    93
                                        CVSROOT shell variable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    94
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    95
        RemoteCVS       <Boolean>       if true, remote CVS access is used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    96
                                        (i.e. via a socket to a CVS server).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    97
                                        if false, disk access is used;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    98
                                        files in CVSRoot must be accessable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    99
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   100
        CVSWorkDirectory                not yet supported/implemented.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   101
                                        PLANNED: name of a directory hierarchy,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   102
                                        which is kept in sync with the current
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   103
                                        version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   104
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   105
        CVSBinDir                       where the CVS commands are found
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   106
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   107
        CVSModuleRoots  <Directory>     per-module roots.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   108
                                        If empty, or no entry is found for a
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   109
                                        module is found, CVSRoot is used.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   110
                                        Otherwise, specifies a per-module CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   111
                                        (allows multiple CVS hierarchies)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   112
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   113
    [author:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   114
        Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   115
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   116
    [see also:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   117
        ( cvs manual page :man: cvs )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   118
        ( Coding style used in Smalltalk/X classes :html: programming/codingStyle.html )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   120
    [restrictions:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   121
        commercial version only
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   122
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   123
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   124
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   125
examples
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   126
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   127
    Default setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   128
        This setup accesses all sources from a single repository: /files/CVS.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   129
        Actually, this is the setup as used within eXept for development.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   130
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   131
            CVSSourceCodeManager initializeForRepository:'/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   132
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   133
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   134
    Dual repository setup:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   135
        This accesses all ST/X standard classes' source from the /files/CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   136
        repository, while your private classes are created in and accessed from
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   137
        '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   138
        This setup is useful, if you need revision management on the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   139
        ST/X standard classes as well as for your own classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   140
        In order to do this, you should (manually) check in all ST/X classes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   141
        into a private repository WHILE preserving the original revision numbers.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   142
        A shell-procedure similar to:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   143
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   144
            for i in lib*/*.st
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   145
            do
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   146
                id=`ident $i`
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   147
                set $id
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   148
                rev=$3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   149
                ci -r$rev <CVSDIR>/$i $i
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   150
            done
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   151
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   152
        should acomplish this.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   153
        Now, that you have all ST/X files in your own repository (and with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   154
        original revision numbers), access is possible by defining CVSROOT
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   155
        as above. However, in order to have your own files being stored in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   156
        another repository, you have to give a per-module repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   157
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   158
        This defines the default repository (for your containers):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   159
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   160
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   161
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   162
        and this specifies a repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   163
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   164
            CVSSourceCodeManager repositoryName:'/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   165
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   166
    Dual repository setup for eXept customers with a full licence
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   167
    (these can access our in-house master repository, for convenient software update
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   168
     and uploading):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   169
        All class sourcees under the 'stx' module (i.e. packageID is 'stx:*') can be accessed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   170
        from the eXept cvs server (i.e. CVSROOT for them is :pserver:userName@exept.de:/files/CVS/stc).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   171
        All local classes should be maintained in and accessed from a local cvs repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   172
        such as '/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   173
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   174
        Then, tell the CVSSourceCodeManager about this;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   175
        first the default repository:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   176
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   177
            CVSSourceCodeManager initializeForRepository:'/files/myCVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   178
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   179
        and the repository for all standard ST/X classes (in the stx module):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   180
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   181
            CVSSourceCodeManager repositoryName:':pserver:userName@exept.de:/files/CVS' forModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   182
"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   183
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   184
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   185
!CVSSourceCodeManager class methodsFor:'initialization'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   186
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   187
forgetDisabledModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   188
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   189
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   190
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   191
initCommands
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   192
    CMD_checkout := 'cvs -n checkout %1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   193
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   194
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   195
initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   196
    "check if $CVSROOT (the shell variable) or CVSRoot (the smalltalk global)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   197
     is set, check if cvs commands can be executed and install myself as the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   198
     SourceCodeManager if this works out ok"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   199
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   200
    | s f top ok triedPath cvsCmd cmdName |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   201
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   202
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   203
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   204
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   205
    "/ if CVSROOT is non-empty and both cvs and co are available
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   206
    "/ as commands, assume this system uses a cvs source code management.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   207
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   208
    CVSRoot ifNil:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   209
        CVSRoot := OperatingSystem getEnvironment:'CVSROOT'.
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   210
        CVSRoot ifNil:[
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   211
            "disabled since $CVSROOT is not set"
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   212
            ^ self
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   213
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   214
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   215
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   216
    OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   217
        cvsCmd := 'cvs.exe'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   218
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   219
        cvsCmd := 'cvs'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   220
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   221
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   222
    CVSBinDir size > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   223
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   224
            cmdName := CVSBinDir asFilename constructString:cvsCmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   225
            ( OperatingSystem canExecuteCommand:cmdName) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   226
                CVSBinDir := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   227
            ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   228
                CVSBinDir := CVSBinDir asFilename pathName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   229
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   230
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   231
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   232
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   233
    CVSBinDir size == 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   234
        CVSBinDir := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   235
        (ok := OperatingSystem canExecuteCommand:cvsCmd) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   236
            "/ mhmh - no cvs;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   237
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   238
            OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   239
                triedPath := #( '/usr/local/bin' ).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   240
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   241
                OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   242
                    triedPath := Array with:'c:\bin'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   243
                                        with:(Filename currentDirectory pathName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   244
                                        with:(OperatingSystem stxBinDirPath ? 'c:\windows').
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   245
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   246
                    triedPath := #()
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   247
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   248
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   249
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   250
            triedPath do:[:eachTriedDir |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   251
                ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   252
                    (OperatingSystem canExecuteCommand:(eachTriedDir asFilename constructString:cvsCmd)) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   253
                        ok := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   254
                        CVSBinDir := eachTriedDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   255
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   256
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   257
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   258
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   259
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   260
        ok := OperatingSystem canExecuteCommand:(CVSBinDir asFilename constructString:cvsCmd).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   261
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   262
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   263
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   264
        'CVSSourceCodeManager [warning]: disabled since no >> cvs << command found' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   265
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   266
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   267
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   268
"/    (OperatingSystem canExecuteCommand:(CVSBinDir , 'co')) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   269
"/        'CVSSourceCodeManager [warning]: limited functionality - no >> co << command found' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   270
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   271
"/    (OperatingSystem canExecuteCommand:(CVSBinDir , 'rlog')) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   272
"/        'CVSSourceCodeManager [warning]: limited functionality - no >> rlog << command found' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   273
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   274
"/    (OperatingSystem canExecuteCommand:(CVSBinDir , 'patch')) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   275
"/        'CVSSourceCodeManager [warning]: limited functionality - no >> patch << command found' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   276
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   277
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   278
    RemoteCVS := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   279
    UseWorkTree := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   280
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   281
    CacheDirectoryName ifNil:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   282
        self initCacheDirPath.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   283
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   284
    CachingSources ifNil:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   285
        CachingSources := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   286
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   287
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   288
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   289
    "/ check if there is an stx directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   290
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   291
    ((f := CVSRoot asFilename) isDirectory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   292
    and:[(top := f construct:'stx') isDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   293
    and:[top isReadable]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   294
        RemoteCVS := false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   295
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   296
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   297
    Smalltalk at:#SourceCodeManager put:self.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   298
    DefaultManager := self.    
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   299
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   300
    ('CVSSourceCodeManager [info]: repository CVSROOT is ''' , CVSRoot , '''.') infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   301
    RemoteCVS ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   302
        'CVSSourceCodeManager [info]: assume remote CVS mode (no stx found in CVSROOT)' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   303
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   304
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   305
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   306
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   307
    "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   308
    "/ if non-nil, a working tree is kept there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   309
    "/ and updated/commited files are not removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   310
    "/ If you use a regular (make-) tree, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   311
    "/ set WorkTreeDirectoryName (or the environment variable) to that.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   312
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   313
    "/ this is not yet finished.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   314
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   315
    s := OperatingSystem getEnvironment:'STX_WORKTREE'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   316
    s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   317
        WorkTreeDirectoryName := s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   318
        UseWorkTree := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   319
    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   320
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   321
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   322
     AbstractSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   323
     CVSSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   324
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   325
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   326
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   327
     CVSRoot := '/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   328
     AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   329
     CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   330
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   331
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   332
    "Created: / 4.11.1995 / 19:14:38 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   333
    "Modified: / 19.12.1995 / 14:25:46 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   334
    "Modified: / 5.12.2001 / 18:52:00 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   335
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   336
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   337
initializeForRepository:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   338
    "set the global CVSROOT directory (i.e. the repositories name).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   339
     And reinitialize. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   340
     Can be used from the launcher to change/configure the repository."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   341
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   342
    self repositoryName:aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   343
    AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   344
    CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   345
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   346
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   347
     CVSSourceCodeManager initializeForRepository:'/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   348
     CVSSourceCodeManager initializeForRepository:'ibm:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   349
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   350
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   351
    "Created: / 13.8.1997 / 17:20:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   352
    "Modified: / 25.9.1997 / 12:28:05 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   353
    "Modified: / 2.11.1997 / 17:08:27 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   354
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   355
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   356
!CVSSourceCodeManager class methodsFor:'accessing'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   357
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   358
cvsBinDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   359
    "return the name of the bin repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   360
     Thats the directory, where the cvs / cvs.exe command is found."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   361
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   362
    ^ CVSBinDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   363
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   364
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   365
cvsBinDirectory:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   366
    "set the name of the bin repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   367
     Thats the directory, where the cvs / cvs.exe command is found."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   368
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   369
    aString isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   370
        CVSBinDir := aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   371
    ] ifFalse:[        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   372
        CVSBinDir := aString asFilename pathName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   373
        (CVSBinDir endsWith:Filename separator) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   374
            CVSBinDir := CVSBinDir copyWithoutLast:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   375
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   376
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   377
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   378
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   379
cvsTmpDirectory
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   380
    "return the name of the tmp repository.
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   381
     Thats the directory, where temporary files are created for checkin/checkout.
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   382
     If nil, the systems default tempDirectory is used."
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   383
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   384
    ^ (CVSTempDir ? Filename tempDirectory pathName)
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   385
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   386
    "
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   387
     CVSTempDir := nil   
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   388
    "
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   389
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   390
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   391
cvsTmpDirectory:aPathNameString
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   392
    "set the name of the tmp repository.
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   393
     Thats the directory, where temporary files are created for checkin/checkout.
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   394
     If nil, the systems default tempDirectory is used."
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   395
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   396
    CVSTempDir := aPathNameString
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   397
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   398
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   399
repositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   400
    "return the name of the global repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   401
     This is used, if no per-module repository is defined."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   402
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   403
    ^ CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   404
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   405
    "Created: 14.9.1996 / 13:22:05 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   406
    "Modified: 19.9.1997 / 06:12:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   407
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   408
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   409
repositoryName:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   410
    "set the name of the repository;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   411
     thats the name of the global CVSROOT directory, which is used 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   412
     if no specific repository was defined for a module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   413
     Can be used from an rc-script, to override the CVSROOT shell 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   414
     variable setting."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   415
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   416
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   417
    CVSRoot := aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   418
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   419
    "Created: 14.9.1996 / 13:22:24 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   420
    "Modified: 19.9.1997 / 06:10:31 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   421
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   422
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   423
repositoryName:aRepositoryName forModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   424
    "set the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   425
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   426
     This can be used from an rc-script, to specify a repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   427
     for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   428
     If left unspecified, the global (i.e. fallBack) repository is used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   429
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   430
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   431
    CVSModuleRoots isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   432
        CVSModuleRoots := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   433
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   434
    CVSModuleRoots at:aModuleName put:aRepositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   435
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   436
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   437
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   438
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   439
repositoryNameForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   440
    "return the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   441
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   442
     Nil is returned for unspecified moduleRoots; in this case, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   443
     the global (i.e. fallBack) repository will be used for source access."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   444
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   445
    CVSModuleRoots isNil ifTrue:[^nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   446
    ^ CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   447
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   448
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   449
    "Created: 19.9.1997 / 06:13:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   450
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   451
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   452
repositoryNamesPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   453
    "return the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   454
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   455
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   456
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   457
    ^ CVSModuleRoots ? (Dictionary new)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   458
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   459
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   460
repositoryNamesPerModule:aDictionary
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   461
    "set the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   462
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   463
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   464
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   465
    CVSModuleRoots := aDictionary
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   466
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   467
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   468
!CVSSourceCodeManager class methodsFor:'private'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   469
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   470
checkOut:relativeFilename module:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   471
    "checkout realtiveFilename in tempdir"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   472
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   473
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   474
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   475
    cmd := 'checkout -l ' , relativeFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   476
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   477
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   478
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   479
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   480
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   481
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   482
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   483
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   484
      self checkOut:'stx/libbasic/Integer.st' asFilename in:'/tmp' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   485
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   486
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   487
    "Created: / 18.1.2000 / 20:30:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   488
    "Modified: / 18.1.2000 / 20:35:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   489
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   490
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   491
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   492
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   493
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   494
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   495
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   496
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   497
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   498
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   499
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   500
        option2:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   501
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   502
    "Created: 10.12.1995 / 17:34:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   503
    "Modified: 12.9.1996 / 02:39:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   504
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   505
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   506
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   507
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   508
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   509
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   510
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   511
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   512
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   513
        option2:optionTitle2 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   514
        option3:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   515
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   516
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   517
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   518
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   519
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   520
    |l box list listView optionPressed option2Pressed option3Pressed|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   521
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   522
    l := log collect:[:line | line withTabsExpanded].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   523
    list := SelectionInList with:l.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   524
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   525
    box := Dialog new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   526
    box label:(title).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   527
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   528
    (box addTextLabel:message) borderWidth:0.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   529
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   530
    listView := SelectionInListView on:list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   531
    listView disable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   532
    listView height:200.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   533
    box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   534
    box addVerticalSpace.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   535
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   536
    abortable ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   537
        box addAbortButton
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   538
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   539
    optionTitle notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   540
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   541
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   542
    optionTitle2 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   543
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   544
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   545
    optionTitle3 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   546
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   547
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   548
    box addOkButton.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   549
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   550
    box extent:(box preferredExtent).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   551
    box minExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   552
    box maxExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   553
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   554
    box open.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   555
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   556
    box destroy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   557
    optionPressed == true ifTrue:[^ #option].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   558
    option2Pressed == true ifTrue:[^ #option2].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   559
    option3Pressed == true ifTrue:[^ #option3].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   560
    ^ box accepted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   561
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   562
    "Created: 9.9.1996 / 19:12:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   563
    "Modified: 12.9.1996 / 02:39:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   564
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   565
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   566
createEntryFor:pathInRepository module:aModule in:aDirectory revision:rev date:date special:special overwrite:overwrite
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   567
    "create an CVS/Repository and CVS/Entries entry for filename. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   568
     If the path does not exist, it will be created
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   569
     If overwrite is true, an existing Entry will be overwritten.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   570
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   571
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   572
    |filename cvsRoot cvsDir name entries firstPart s path|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   573
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   574
    filename := pathInRepository asFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   575
    cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   576
    entries := cvsDir construct:'Entries'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   577
    name := filename baseName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   578
    firstPart := '/', name, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   579
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   580
    s := entries readStreamOrNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   581
    s isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   582
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   583
        "/ no Repository yet, create one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   584
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   585
        |index root|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   586
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   587
        cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   588
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   589
        "/ match for first '/', to get the path portion without :pserver:host:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   590
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   591
        index := cvsRoot indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   592
        index > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   593
            root := cvsRoot copyFrom:(index).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   594
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   595
            root := cvsRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   596
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   597
        "/ create Repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   598
        "/ (notice, contents must be a Unix filename ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   599
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   600
        s := (cvsDir construct:'Repository') writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   601
        path := Filename components:filename directory name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   602
        path := path asStringWith:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   603
        s nextPutLine:(root, '/', path).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   604
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   605
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   606
        "/ make new Entries file.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   607
        s := entries writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   608
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   609
        |newName newStream line|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   610
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   611
        newName := Filename newTemporaryIn:cvsDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   612
        newStream := newName writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   613
        [(line := s nextLine) notNil] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   614
            (line findString:firstPart) ~= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   615
                "/ we have found an entry for ourself.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   616
                "/ If we do not want to overwrite it, clean up everything and return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   617
                overwrite ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   618
                    newName remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   619
                    newStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   620
                    s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   621
                    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   622
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   623
                newStream nextPutLine:line
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   624
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   625
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   626
        newName renameTo:entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   627
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   628
        s := newStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   629
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   630
    s nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   631
    s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   632
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   633
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   634
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   635
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'3.44' date:'new dummy' special:'special'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   636
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   637
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   638
    "Created: / 19.9.1997 / 06:21:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   639
    "Modified: / 7.1.1998 / 14:15:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   640
    "Modified: / 20.8.1998 / 00:12:11 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   641
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   642
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   643
createLocalDirectory:packageDir inModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   644
    "create a local working directory for module/package.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   645
     To speed up things, we checkout the file '.cvsignore', to create
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   646
     the whole tree. If the file is not present, we will create it as empty file.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   647
     Return the name of a temporary directory containing the package"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   648
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   649
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   650
        createLocalDirectory:packageDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   651
        inModule:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   652
        with:'.cvsignore'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   653
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   654
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   655
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   656
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   657
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   658
    "Created: / 23.7.1999 / 19:14:28 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   659
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   660
    "Modified: / 18.1.2000 / 20:56:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   661
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   662
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   663
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   664
    "create a local working directory for module/package, and checkout the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   665
     given file there.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   666
     Return the name of a temporary directory containing the package, or nil"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   667
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   668
    |path absolutePath tempdir workingDir unixPath|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   669
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   670
    path := (moduleDir asFilename construct:packageDir) construct:fileToCheckout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   671
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   672
    tempdir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   673
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   674
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   675
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   676
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   677
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   678
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   679
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   680
            unixPath := path name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   681
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   682
            OperatingSystem isVMSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   683
                self error:'VMS case not yet implemented'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   684
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   685
            unixPath := path name copy replaceAll:$\ with:$/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   686
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   687
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   688
        (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   689
            "dummy file does not exist, so create it"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   690
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   691
            absolutePath := tempdir construct:path.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   692
            absolutePath directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   693
            "now create the file"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   694
            (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   695
                ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   696
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   697
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   698
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   699
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   700
            "now create the dummy file in the repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   701
            (self import:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   702
                ('CVSSourceCodeManager [error]: cannot import dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   703
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   704
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   705
            "remove the path, so that checkout works"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   706
            (tempdir construct:moduleDir) recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   707
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   708
            "checkout the dummy, the intermediate directories will be created"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   709
            (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   710
                ('CVSSourceCodeManager [warning]: import failed (to create working dir)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   711
"/false ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   712
"/                "/ manually create it
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   713
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   714
"/                (tempdir construct:unixPath) directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   715
"/                workingDir := tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   716
"/                unixPath asFilename directory components do:[:each |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   717
"/                    self executeCVSCommand:('add ' , each) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   718
"/                    workingDir := workingDir construct:each.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   719
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   720
"/                (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   721
"/                    ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   722
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   723
"/                    ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   724
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   725
"/                self executeCVSCommand:('add ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   726
"/                self executeCVSCommand:('commit ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   727
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   728
"/                ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   729
"/].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   730
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   731
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   732
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   733
        ].
1406
725a5b2866f2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1405
diff changeset
   734
    ] ifCurtailed:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   735
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   736
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   737
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   738
    ^ tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   739
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   740
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   741
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   742
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   743
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   744
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   745
    "Created: / 18.1.2000 / 20:55:52 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   746
    "Modified: / 18.1.2000 / 20:56:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   747
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   748
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   749
createTempDirectory:packageDir forModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   750
    "create a temp directory for checking out"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   751
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   752
    |tempdir dir|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   753
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   754
    "/ if CVSTempDir isNil, use current.
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   755
    tempdir := Filename newTemporaryIn:(self cvsTmpDirectory).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   756
    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   757
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   758
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   759
    OperatingSystem errorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   760
        'SourceCodemanager [error]: cannot create temporary directory' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   761
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   762
    ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   763
        tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   764
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   765
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   766
    moduleDir notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   767
        dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   768
        dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   769
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   770
        packageDir notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   771
            dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   772
            dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   773
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   774
        dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   775
            tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   776
            'SourceCodemanager [error]: cannot create temporary directory' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   777
            ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   778
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   779
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   780
    ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   781
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   782
    "self createTempDirectory:'fooPackage' forModule:'fooModule'"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   783
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   784
    "Created: 9.12.1995 / 19:14:35 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   785
    "Modified: 19.12.1995 / 16:13:02 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   786
    "Modified: 18.8.1997 / 19:06:52 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   787
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   788
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   789
cvsTimeString:absoluteTime
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   790
    "convert a Timestamp to a string suitable for the CVS/Entries file:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   791
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   792
                         123456789012345678901234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   793
                         Tue Dec 19 20:56:26 1995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   794
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   795
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   796
    |date time stream|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   797
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   798
    date := absoluteTime asDate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   799
    time := absoluteTime asTime.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   800
    stream := WriteStream on:(String new:24).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   801
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   802
    (#('Mon' 'Tue' 'Wed' 'Thu' 'Fri' 'Sat' 'Sun') at:(date dayInWeek)) printOn:stream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   803
    stream space.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   804
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   805
    (#('Jan' 'Feb' 'Mar' 'Apr' 'May' 'Jun' 'Jul' 'Aug' 'Sep' 'Oct' 'Nov' 'Dec') 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   806
        at:(date month)) printOn:stream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   807
    stream space.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   808
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   809
    date day printOn:stream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   810
    stream space.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   811
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   812
    time print24HourFormatOn: stream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   813
    stream space.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   814
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   815
    date year printOn:stream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   816
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   817
    ^ stream contents
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   818
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   819
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   820
    "
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   821
     CVSSourceCodeManager cvsTimeString:(Timestamp now)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   822
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   823
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   824
    "Modified: 20.12.1995 / 11:03:32 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   825
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   826
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   827
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   828
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   829
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   830
     This also leads to a log-entry to be added to cvs's logfile."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   831
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   832
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   833
        executeCVSCommand:cvsCommand 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   834
        module:moduleName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   835
        inDirectory:dir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   836
        log:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   837
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   838
    "Modified: / 20.5.1998 / 16:07:28 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   839
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   840
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   841
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   842
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   843
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   844
     The doLog argument, if false supresses a logEntry to be added 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   845
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   846
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   847
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   848
        executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   849
        pipe:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   850
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   851
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   852
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog errorTo:errorStream 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   853
    ^ self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   854
        executeCVSCommand:cvsCommand
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   855
        module:moduleName
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   856
        inDirectory:dirArg
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   857
        log:doLog
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   858
        outputTo:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   859
        errorTo:errorStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   860
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   861
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   862
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog outputTo:outStream errorTo:errorStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   863
    "execute command and prepend cvs command name and global options.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   864
     execute command in the dirArg directory.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   865
     The doLog argument, if false supresses a logEntry to be added 
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   866
     in the cvs log file (used when reading / extracting history)"
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   867
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   868
    |command cvsRoot rslt ok pathOfDir p dir|
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   869
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   870
    dirArg notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   871
        dir := dirArg asFilename.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   872
        pathOfDir := dir pathName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   873
    ].
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   874
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   875
    cvsRoot := self getCVSROOTForModule:moduleName.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   876
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   877
    command := CVSBinDir.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   878
    command size > 0 ifTrue:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   879
        (command endsWith:Filename separator) ifFalse:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   880
            command := command , (Filename separator)
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   881
        ]
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   882
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   883
    command := command , 'cvs'.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   884
    (command includes:Character space) ifTrue:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   885
        command := '"' , command , '"'        
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   886
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   887
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   888
    doLog ifFalse:[
1393
28d04a5111c6 cvs V1.11.14 does not support the 'cvs -l' option any longer and breaks
Stefan Vogel <sv@exept.de>
parents: 1390
diff changeset
   889
"/ cvs  1.11.14 fails with -l option
28d04a5111c6 cvs V1.11.14 does not support the 'cvs -l' option any longer and breaks
Stefan Vogel <sv@exept.de>
parents: 1390
diff changeset
   890
"/        command := command , ' -l'.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   891
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   892
    command := command , ' -d "', cvsRoot, '" ', cvsCommand.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   893
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   894
    Verbose == true ifTrue:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   895
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' , pathOfDir , ']') infoPrintCR.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   896
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   897
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   898
    Processor isDispatching ifFalse:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   899
        rslt := ok := OperatingSystem executeCommand:command 
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   900
                                inputFrom:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   901
                                outputTo:outStream 
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   902
                                errorTo:errorStream 
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   903
                                auxFrom:nil
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   904
                                inDirectory:pathOfDir
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   905
                                lineWise:false
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   906
                                onError:[:status| false].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   907
    ] ifTrue:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   908
        p := [
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   909
            rslt := ok := OperatingSystem executeCommand:command
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   910
                                inputFrom:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   911
                                outputTo:outStream 
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   912
                                errorTo:errorStream 
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   913
                                auxFrom:nil
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   914
                                inDirectory:pathOfDir
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   915
                                lineWise:false
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   916
                                onError:[:status| false].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   917
        ] fork.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   918
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   919
        (p waitUntilTerminatedWithTimeout:300) ifTrue:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   920
            ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   921
            ^ false
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   922
        ]. 
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   923
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   924
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   925
    ok ifFalse:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   926
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   927
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   928
    ^ rslt
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   929
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   930
    "Modified: / 23.4.1996 / 15:24:00 / stefan"
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   931
    "Created: / 20.5.1998 / 16:06:34 / cg"
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   932
    "Modified: / 19.5.1999 / 10:43:57 / cg"
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   933
!
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   934
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   935
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   936
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   937
     execute command in the dirArg directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   938
     The doLog argument, if false supresses a logEntry to be added 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   939
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   940
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   941
    |command cvsRoot rslt ok pathOfDir p|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   942
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   943
    dirArg notNil ifTrue:[    
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   944
        pathOfDir := dirArg asFilename pathName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   945
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   946
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   947
    cvsRoot := self getCVSROOTForModule:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   948
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   949
    command := CVSBinDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   950
    command size > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   951
        (command endsWith:Filename separator) ifFalse:[
1387
a3611183c69d separatorString / separator
Claus Gittinger <cg@exept.de>
parents: 1373
diff changeset
   952
            command := command , (Filename separator)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   953
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   954
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   955
    command := command , 'cvs'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   956
    (command includes:Character space) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   957
        command := '"' , command , '"'        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   958
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   959
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   960
    doLog ifFalse:[
1393
28d04a5111c6 cvs V1.11.14 does not support the 'cvs -l' option any longer and breaks
Stefan Vogel <sv@exept.de>
parents: 1390
diff changeset
   961
"/ cvs  1.11.14 fails with -l option
28d04a5111c6 cvs V1.11.14 does not support the 'cvs -l' option any longer and breaks
Stefan Vogel <sv@exept.de>
parents: 1390
diff changeset
   962
"/        command := command , ' -l'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   963
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   964
    command := command , ' -d "', cvsRoot, '" ', cvsCommand.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   965
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   966
    Verbose == true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   967
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' , pathOfDir , ']') infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   968
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   969
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   970
    doPipe ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   971
        rslt := PipeStream readingFrom:command inDirectory:pathOfDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   972
        ok := rslt notNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   973
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   974
        Processor isDispatching ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   975
            rslt := ok := OperatingSystem executeCommand:command inDirectory:pathOfDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   976
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   977
            p := [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   978
                rslt := ok := OperatingSystem executeCommand:command inDirectory:pathOfDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   979
            ] fork.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   980
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   981
            (p waitUntilTerminatedWithTimeout:300) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   982
                ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   983
                ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   984
            ]. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   985
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   986
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   987
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   988
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   989
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   990
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   991
    ^ rslt
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   992
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   993
    "Modified: / 23.4.1996 / 15:24:00 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   994
    "Created: / 20.5.1998 / 16:06:34 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   995
    "Modified: / 19.5.1999 / 10:43:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   996
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   997
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   998
getCVSROOTForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   999
    "internal: used when accessing a source repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1000
     Return the CVSROOT which provides the sources for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1001
     If no specific root was defined for that module, return the value of
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1002
     the global (fallBack) CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1003
     Nil is returned if no repository is available." 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1004
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1005
    |root|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1006
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1007
    CVSModuleRoots isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1008
    aModuleName isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1009
    root := CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1010
    ^ root ? CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1011
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1012
    "Created: / 19.9.1997 / 06:18:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1013
    "Modified: / 20.5.1998 / 16:30:12 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1014
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1015
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1016
getCVSROOTsPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1017
    "return a dictionary, which associates CVSRoots to modules" 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1018
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1019
    ^ CVSModuleRoots ? #()
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1020
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1021
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1022
import:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1023
    "import the existing tree in tempdir as repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1024
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1025
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1026
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1027
    cmd := 'import -m "checkin from stx browser" . initialV initialR'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1028
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1029
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1030
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1031
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1032
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1033
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1034
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1035
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1036
      |f d|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1037
      f := 'stefan/dummy/fasel'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1038
      d := '/tmp/tt' asFilename construct:f.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1039
      d directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1040
      d writeStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1041
      self import:'stefan' in:'/tmp/tt/stefan' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1042
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1043
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1044
    "Created: / 23.7.1999 / 19:19:34 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1045
    "Modified: / 26.7.1999 / 17:46:29 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1046
    "Modified: / 18.1.2000 / 20:21:32 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1047
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1048
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1049
readRevisionLogEntryFromStream:inStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1050
    "read and parse a single revision info-entry from the cvs log output.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1051
     Return nil on end.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1052
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1053
     The returned information is a structure (IdentityDictionary)
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1054
     filled with:
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1055
              #revision              -> the revision string
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1056
              #author                -> who checked that revision into the repository
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1057
              #date                  -> when was it checked in
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1058
              #state                 -> the RCS state
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1059
              #numberOfChangedLines  -> the number of changed line w.r.t the previous
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1060
              #logMessage            -> the checkIn log message
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1061
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1062
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1063
    |revLine1 revLine2 record s line atEnd|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1064
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1065
    atEnd := false.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1066
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1067
    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1068
    [revLine1 notNil and:[(revLine1 startsWith:'revision ') not]]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1069
        whileTrue:[inStream atEnd ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1070
                    revLine1 := nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1071
                   ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1072
                    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1073
                  ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1074
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1075
    revLine2 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1076
    (revLine1 notNil and:[revLine2 notNil]) ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1077
        record := IdentityDictionary new.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1078
        record at:#revision put:(revLine1 asCollectionOfWords at:2).
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1079
        "/ decompose date/author/state etc.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1080
        (revLine2 asCollectionOfSubstringsSeparatedBy:$;) do:[:info |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1081
            |subEntry|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1082
            subEntry := info withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1083
            #('date:'   #date
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1084
              'author:' #author 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1085
              'state:'  #state 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1086
              'lines:'  #numberOfChangedLines
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1087
             ) pairWiseDo:[:word :key |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1088
                s := subEntry restAfter:word withoutSeparators:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1089
                s notNil ifTrue:[record at:key put:s.].                        
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1090
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1091
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1092
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1093
        "first revision does not hav a 'lines:' entry"
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1094
        (record includesKey:#numberOfChangedLines) ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1095
            record at:#numberOfChangedLines put:''
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1096
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1097
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1098
        s := nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1099
        line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1100
        [atEnd or:[line isNil or:[line startsWith:'--------']]] whileFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1101
            (line startsWith:'==========') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1102
                atEnd := true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1103
            ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1104
                (line withoutSpaces = '.') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1105
                    line := '*** empty log message ***'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1106
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1107
                s isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1108
                    s := line
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1109
                ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1110
                    s := s , Character cr asString , line.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1111
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1112
                line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1113
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1114
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1115
        record at:#logMessage put:s.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1116
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1117
    ^record.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1118
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1119
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1120
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1121
releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1122
    "cleanup; release tree towards cvs and remove the temporary tree"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1123
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1124
    |cmd redirect|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1125
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1126
    outputFilename isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1127
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1128
            redirect := 'NUL'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1129
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1130
            redirect := '/dev/null'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1131
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1132
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1133
        redirect := outputFilename name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1134
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1135
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1136
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1137
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1138
    "/
1393
28d04a5111c6 cvs V1.11.14 does not support the 'cvs -l' option any longer and breaks
Stefan Vogel <sv@exept.de>
parents: 1390
diff changeset
  1139
    cmd := 'release > ' , redirect.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1140
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1141
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1142
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1143
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1144
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1145
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1146
"/        'CVSMGR: failed to release: ' errorPrint. cmd errorPrintNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1147
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1148
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1149
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1150
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1151
    "Modified: / 23.4.1996 / 14:29:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1152
    "Created: / 19.9.1997 / 06:28:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1153
    "Modified: / 20.5.1998 / 16:44:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1154
    "Modified: / 3.9.1999 / 14:51:29 / ps"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1155
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1156
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1157
repositoryTopDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1158
    "return the top of the repository. This handles remote CVS connections
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1159
     as well"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1160
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1161
    CVSRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1162
    ^ self repositoryTopDirectory:CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1163
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1164
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1165
     CVSSourceCodeManager repositoryTopDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1166
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1167
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1168
    "Created: / 25.11.1995 / 18:39:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1169
    "Modified: / 16.1.1998 / 17:33:31 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1170
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1171
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1172
repositoryTopDirectory:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1173
    "return the top of the repository (without remote prefix)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1174
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1175
    |idx|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1176
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1177
    idx := aString indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1178
    idx <= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1179
        ^ aString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1180
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1181
    ^ aString copyFrom:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1182
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1183
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1184
     CVSSourceCodeManager repositoryTopDirectory:':pserver:stefan@ibm.exept.de:/archiv/cvs'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1185
     CVSSourceCodeManager repositoryTopDirectory:'exept:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1186
     CVSSourceCodeManager repositoryTopDirectory:'/archiv/cvs'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1187
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1188
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1189
    "Modified: / 16.1.1998 / 17:32:03 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1190
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1191
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1192
revisionStringFromLog:log entry:entry forClass:aClass
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1193
    "given a log entry, extract a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1194
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1195
    |oldRev idx special|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1196
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1197
    oldRev := aClass revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1198
    special := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1199
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1200
    oldRev notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1201
        idx := oldRev lastIndexOf:$[.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1202
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1203
            idx := oldRev indexOf:$[ startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1204
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1205
                special := ' ' , (oldRev copyFrom:idx).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1206
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1207
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1208
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1209
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1210
    ^ '$Header: ' , (log at:#container) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1211
      ' ' , (entry at:#revision) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1212
      ' ' , (entry at:#date) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1213
      ' ' , (entry at:#author) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1214
      ' ' , (entry at:#state) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1215
      ' $' ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1216
      special
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1217
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1218
    "Created: 16.9.1996 / 20:24:14 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1219
    "Modified: 3.3.1997 / 22:31:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1220
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1221
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1222
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1223
    "update a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1224
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1225
    |idx leftPart rightPart vsnString newVsn|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1226
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1227
    "/ search for ,v
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1228
    idx := originalVersionString indexOfSubCollection:'.st,v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1229
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1230
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1231
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1232
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1233
    idx := rightPart indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1234
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1235
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1236
    vsnString := rightPart copyTo:idx - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1237
    rightPart := rightPart copyFrom:idx + 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1238
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1239
    newRevision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1240
        (vsnString endsWith:'m') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1241
             "/ alread a modified class
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1242
"/            ('already modified: ' , vsnString) printNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1243
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1244
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1245
        newVsn := vsnString , 'm'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1246
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1247
        newVsn := newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1248
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1249
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1250
    ^ leftPart , ' ' , newVsn , ' ' , rightPart
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1251
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1252
    "Created: 7.12.1995 / 20:23:38 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1253
    "Modified: 16.9.1996 / 20:24:28 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1254
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1255
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1256
!CVSSourceCodeManager class methodsFor:'source code access'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1257
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1258
checkin:containerFilename text:someText directory:packageDir module:moduleDir logMessage:logMessage force:force
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1259
    "enter some (source) code (which is someText)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1260
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1261
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1262
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1263
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1264
    |tempdir cmd checkoutName logMsg revision logTmp 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1265
     cmdOut whatHappened s  idx changeLog changesAsLogged l 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1266
     newRevision  msg answer didMerge
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1267
     modulePath time 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1268
     editor checkInRepaired didAccept emphasizedText repairedText out 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1269
     emSep comment|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1270
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1271
    revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1272
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1273
    logMsg := logMessage.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1274
    (logMsg isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1275
        logMsg := 'checkin from browser'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1276
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1277
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1278
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1279
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1280
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1281
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1282
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1283
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1284
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1285
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1286
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1287
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1288
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1289
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1290
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1291
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1292
    tempdir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1293
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1294
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkin ' , containerFilename) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1295
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1296
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1297
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1298
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1299
    "/ next, create CVS/Entries and CVS/Repository with version information of current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1300
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1301
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1302
    checkoutName :=  modulePath , '/' , containerFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1303
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1304
    revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1305
        "/ a new file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1306
        ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1307
            createContainerForText:someText inModule:moduleDir package:packageDir container:containerFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1308
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1309
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1310
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1311
    "/ correct our current time, so that converting it will give us UTC
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1312
    "/
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
  1313
    time := Timestamp now subtractSeconds:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1314
    time := time addSeconds:(time utcOffset).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1315
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1316
    self createEntryFor:checkoutName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1317
         module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1318
         in:(tempdir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1319
         revision:revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1320
         date:(self cvsTimeString:time)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1321
         special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1322
         overwrite:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1323
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1324
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1325
    "/ copy-over our current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1326
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1327
    Stream errorSignal handle:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1328
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1329
        'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1330
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1331
    ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1332
        s := (tempdir construct:checkoutName) writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1333
        s nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1334
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1335
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1336
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1337
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1338
    "/ synchronize i.e. merge in any changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1339
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1340
    self activityNotification:'merging ' , containerFilename , ' with repository version ...'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1341
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1342
    cmd := 'update ', containerFilename, ' >', '"' , cmdOut name , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1343
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1344
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1345
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1346
        inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1347
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1348
        force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1349
            'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1350
            tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1351
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1352
            'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1353
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1354
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1355
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1356
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1357
        "/ check what happened - the contents of the cmdOut file may be:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1358
        "/   empty   -> nothing changed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1359
        "/   M xxx   -> merged-in changes from other users
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1360
        "/   C xxx   -> a conflict occured and the differences have been merged into the source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1361
        "/              needs special action
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1362
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1363
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1364
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1365
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1366
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1367
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1368
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1369
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1370
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1371
        "/ no change
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1372
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1373
"/        Transcript showCR:'no change in ' , containerFilename , ' (repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1374
        force ifFalse:[
1424
2b531fae15e5 oops - must proceed after catching a UserNotification
Claus Gittinger <cg@exept.de>
parents: 1419
diff changeset
  1375
self halt.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1376
            self information:'nothing changed in ' , containerFilename , ' (repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1377
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1378
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1379
        ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1380
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1381
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1382
    Verbose == true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1383
        ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1384
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1385
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1386
    force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1387
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1388
            changeLog := self revisionLogOfContainer:containerFilename directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1389
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1390
            changeLog := self revisionLogOfContainer:containerFilename module:moduleDir package:packageDir fromRevision:(self revisionAfter:revision) toRevision:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1391
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1392
        changeLog notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1393
            s := WriteStream on:String new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1394
            self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1395
            changesAsLogged := s contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1396
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1397
            "/ mhmh - that should not happen
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1398
            changesAsLogged := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1399
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1400
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1401
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1402
    didMerge := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1403
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1404
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1405
    "/ cvs above rel10 returns a multiline info ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1406
    "/ we have to extract the one line which states what happened.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1407
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1408
    whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1409
    whatHappened := whatHappened select:[:line |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1410
                        (line startsWith:'RCS file') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1411
                        and:[(line startsWith:'retrieving') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1412
                        and:[(line startsWith:'Merging') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1413
                        and:[line size > 0]]]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1414
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1415
    whatHappened := whatHappened asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1416
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1417
    (force or:[whatHappened startsWith:'M ']) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1418
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1419
        "/ merged in changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1420
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1421
        (force 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1422
        or:[changeLog isNil 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1423
        or:[(changeLog at:#revisions) isEmpty]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1424
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1425
            "/ pretty good - nothing has changed in the meanwhile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1426
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1427
            Transcript showCR:'checking in ' , containerFilename , ' ...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1428
        ] ifFalse:[
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1429
            | mySource mergedSource |
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1430
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1431
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1432
            "/ someone else has changed things in the meanwhile, but there is no conflict
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1433
            "/ and version have been merged.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1434
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1435
            didMerge := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1436
            changesAsLogged := changesAsLogged asCollectionOfLines.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1437
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1438
            s := WriteStream on:String new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1439
            s nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1440
            mySource := s contents asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1441
            mergedSource := (tempdir construct:checkoutName) readStream contents asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1442
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1443
            mySource = mergedSource ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1444
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1445
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1446
I have merged your version with the newest repository version, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1447
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1448
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1449
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1450
                self checkinTroubleDialog:'Merging versions'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1451
                               message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1452
                               log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1453
                               abortable:false 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1454
                               option:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1455
                didMerge := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1456
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1457
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1458
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1459
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1460
into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1461
into a new common revision which may be different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1462
Although this is a nice feature, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1463
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1464
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1465
most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1466
change methods as required and check in again. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1467
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1468
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1469
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1470
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1471
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1472
                answer := self checkinTroubleDialog:'Merging versions'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1473
                               message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1474
                               log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1475
                               abortable:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1476
                               option:'Stop - see first'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1477
                answer ~~ true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1478
                    answer == #option ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1479
                        DiffTextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1480
                            openOn:mySource
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1481
                            label:'current version'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1482
                            and:mergedSource
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1483
                            label:'merged version'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1484
                            
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1485
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1486
                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1487
                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1488
                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1489
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1490
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1491
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1492
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1493
"/                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1494
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1495
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1496
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1497
"/into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1498
"/into a new common revision which is different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1499
"/Although convenient, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1500
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1501
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1502
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1503
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1504
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1505
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1506
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1507
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1508
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1509
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1510
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1511
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1512
            Transcript showCR:'checking in ' , containerFilename , ' (merged other changes) ...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1513
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1514
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1515
        (whatHappened startsWith:'C ') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1516
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1517
            "/ conflict; someone else checked in something in the meanwhile,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1518
            "/ and there is a conflict between this version and the checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1519
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1520
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1521
            changesAsLogged := changesAsLogged asCollectionOfLines.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1522
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1523
            msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1524
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1525
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1526
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1527
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1528
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1529
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1530
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1531
            answer := self checkinTroubleDialog:'Version conflict'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1532
                 message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1533
                 log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1534
                 abortable:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1535
                 option:'show conflicts'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1536
                 option2:'resolve conflicts'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1537
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1538
            answer == #option ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1539
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1540
                "/ show conflicts in a 3-way DiffTextView ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1541
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1542
                Diff3TextView
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1543
                    openOnMergedText:(tempdir construct:checkoutName) readStream contents 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1544
                    label:'your version (checkin attempt)' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1545
                    label:'original (base version)' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1546
                    label:'newest repository version'. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1547
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1548
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1549
            checkInRepaired := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1550
            answer == #option2 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1551
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1552
                "/ allow checkin of repair version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1553
                "/ this is error prone ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1554
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1555
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1556
                "/ show merged version in an editor ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1557
                "/ ... accept will check it in.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1558
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1559
                emphasizedText := (tempdir construct:checkoutName) readStream contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1560
                emSep := (Array with:(#color->Color black)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1561
                             with:(#backgroundColor->Color green)).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1562
                emphasizedText := Diff3TextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1563
                            emphasizeMergedDiff3Text:emphasizedText 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1564
                            emphasize1:(Array with:(#color->Color white)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1565
                                              with:(#backgroundColor->Color blue))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1566
                            emphasize2:(Array with:(#color->Color white)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1567
                                              with:(#backgroundColor->Color red))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1568
                            emphasizeSep:emSep.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1569
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1570
                comment := 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1571
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1572
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1573
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1574
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1575
"/ Each such conflict is surrounded by green text (like this paragraph).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1576
"/ 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1577
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1578
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1579
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1580
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1581
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1582
                comment := (Text string:comment emphasis:emSep) asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1583
                emphasizedText := comment , emphasizedText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1584
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1585
                didAccept := false. checkInRepaired := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1586
                [didAccept not and:[checkInRepaired]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1587
                    editor := RCSConflictEditTextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1588
                                setupWith:emphasizedText
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1589
                                title:'Resolve conflicts in ' , containerFilename , ', then accept & close to checkin'.    
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1590
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1591
                    editor acceptAction:[:dummy |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1592
                        repairedText := editor list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1593
                        didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1594
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1595
                    didAccept := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1596
                    editor topView openModal.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1597
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1598
                    didAccept ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1599
                        (Dialog confirm:'You did not accept the new text. Edit again ?')
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1600
                        ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1601
                            checkInRepaired := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1602
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1603
                    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1604
                        "/ check if all green-stuff (separators) have been removed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1605
                        (repairedText findFirst:[:line | line notNil and:[line notEmpty and:[(line emphasisAt:1) = emSep]]]) ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1606
                            self warn:'You have to look at ALL conflicts, and remove ALL green lines as a confirmation !!'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1607
                            didAccept := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1608
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1609
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1610
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1611
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1612
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1613
                checkInRepaired ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1614
                    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1615
                        out := (tempdir construct:checkoutName) writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1616
                        out nextPutAll:(repairedText asString string).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1617
                        didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1618
                        out close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1619
                    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1620
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1621
                        checkInRepaired := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1622
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1623
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1624
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1625
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1626
            checkInRepaired ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1627
                Transcript showCR:'checking in ' , containerFilename , ' (manually repaired version) ...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1628
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1629
                'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1630
                Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1631
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1632
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1633
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1634
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1635
            (whatHappened startsWith:'U ') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1636
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1637
                "/ nothing changed here, but the repository already contains
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1638
                "/ a newer version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1639
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1640
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1641
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1642
                self information:'nothing changed in your ''' , containerFilename , ''';
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1643
but repository already contains a newer version (repository unchanged).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1644
                ^ true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1645
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1646
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1647
                "/ unexpected
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1648
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1649
                self warn:'unexpected message from CVS:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1650
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1651
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1652
No checkin performed.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1653
                Transcript showCR:'*** cannot checkin ' , containerFilename , ' (unexpected CVS response; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1654
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1655
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1656
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1657
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1658
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1659
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1660
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1661
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1662
    "/ now check it in again
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1663
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1664
    self activityNotification:'saving ' , containerFilename , ' in repository ...'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1665
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1666
    logMsg := logMsg replChar:$"  withString:'\"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1667
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1668
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1669
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1670
        logTmp := Filename newTemporaryIn:tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1671
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1672
        s nextPutAll:logMsg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1673
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1674
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1675
        cmd := 'commit -F "', logTmp baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1676
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1677
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1678
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1679
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1680
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1681
        cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"' , cmdOut name , '"' , ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1682
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1683
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1684
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1685
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1686
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1687
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1688
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1689
        'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1690
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1691
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1692
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1693
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1694
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1695
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1696
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1697
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1698
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1699
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1700
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1701
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1702
       ('CVSSourceCodeManager [error]: cvs: ' , whatHappened) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1703
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1704
        logTmp notNil ifTrue:[logTmp remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1705
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1706
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1707
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1708
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1709
    logTmp notNil ifTrue:[logTmp remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1710
    (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1711
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1712
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1713
        whatHappened := nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1714
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1715
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1716
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1717
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1718
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1719
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1720
    "/ fetch the new revision nr as found in the commit commands output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1721
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1722
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1723
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1724
        'CVSSourceCodeManager [error]: unexpected empty checkin command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1725
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1726
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1727
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1728
        idx == 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1729
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1730
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1731
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1732
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1733
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1734
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1735
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1736
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1737
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1738
checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMessage force:forceArg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1739
    "enter a classes source code (which has been already filed out into sourceFileName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1740
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1741
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1742
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1743
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1744
    |tempdir cmd checkoutName logMsg revision logTmp 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1745
     cmdOut whatHappened s entry idx changeLog changesAsLogged l 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1746
     newRevision newString binRevision className msg answer didMerge
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1747
     modulePath time 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1748
     editor checkInRepaired checkInNew didAccept emphasizedText repairedText out 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1749
     emSep comment force|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1750
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1751
    force := forceArg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1752
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1753
    className := cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1754
    cls isPrivate ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1755
        self error:'refuse to check in private classes.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1756
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1757
    revision := cls revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1758
    (revision notNil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1759
    and:[revision endsWith:$m]) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1760
    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1761
        "/ this class has already been checked in with a merge,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1762
        "/ but not reloaded from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1763
        "/ must use the original revision string.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1764
        revision := revision copyWithoutLast:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1765
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1766
    (binRevision := cls binaryRevision) notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1767
        revision ~= binRevision ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1768
            ('CVSSourceCodeManager [info]: class ' , className , ' is based upon ' , binRevision , ' but has revision ' , (revision ? '?')) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1769
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1770
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1771
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1772
    revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1773
        revision := self newestRevisionOf:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1774
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1775
            force ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1776
                revision := self newestRevisionInFile:classFileName directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1777
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1778
                revision := '1.0'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1779
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1780
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1781
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1782
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1783
    logMessage isNil ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1784
        logMsg := ''.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1785
    ] ifFalse:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1786
        logMsg := logMessage asSingleByteStringIfPossible.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1787
        logMsg bitsPerCharacter ~~ 8 ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1788
            'CVSSourceCodeManager [error]: cvs cannot handle unicode in logMessage' errorPrintCR.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1789
            ^ false.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1790
        ].    
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1791
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1792
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1793
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1794
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1795
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1796
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1797
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1798
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1799
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1800
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1801
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1802
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1803
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1804
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1805
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1806
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1807
    tempdir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1808
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1809
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkin ' , className) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1810
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1811
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1812
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1813
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1814
    "/ next, create CVS/Entries and CVS/Repository with version information of current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1815
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1816
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1817
    checkoutName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1818
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1819
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1820
    "/ correct our current time, so that converting it will give us UTC
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1821
    "/
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
  1822
    time := Timestamp now subtractSeconds:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1823
    time := time addSeconds:(time utcOffset).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1824
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1825
    self createEntryFor:checkoutName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1826
         module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1827
         in:(tempdir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1828
         revision:revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1829
         date:(self cvsTimeString:time)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1830
         special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1831
         overwrite:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1832
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1833
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1834
    "/ copy-over our current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1835
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1836
    Error handle:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1837
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1838
        'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1839
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1840
    ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1841
        sourceFileName asFilename copyTo:(tempdir construct:checkoutName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1842
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1843
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1844
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1845
    "/ synchronize i.e. merge in any changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1846
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1847
    self activityNotification:'merging ' , cls name , ' with repository version ...'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1848
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1849
    cmd := 'update ', classFileName, ' >', '"' , cmdOut name , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1850
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1851
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1852
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1853
        inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1854
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1855
        force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1856
            "/ someone fiddled around with repository ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1857
            (cls binaryRevision notNil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1858
            and:[(self checkForExistingContainerInModule:moduleDir package:packageDir container:classFileName) not ])
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1859
            ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1860
                (Dialog confirm:('Someone seems to have removed the source container for ' , cls name , '\\Force new checkin ?') withCRs)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1861
                ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1862
                    cls setBinaryRevision:nil.
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1863
                    ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMsg force:force.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1864
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1865
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1866
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1867
        force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1868
            'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1869
            tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1870
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1871
            'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1872
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1873
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1874
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1875
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1876
        "/ check what happened - the contents of the cmdOut file may be:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1877
        "/   empty   -> nothing changed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1878
        "/   M xxx   -> merged-in changes from other users
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1879
        "/   C xxx   -> a conflict occured and the differences have been merged into the source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1880
        "/              needs special action
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1881
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1882
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1883
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1884
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1885
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1886
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1887
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1888
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1889
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1890
        "/ no change
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1891
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1892
"/        Transcript showCR:'no change in ' , className , ' (repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1893
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1894
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1895
        force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1896
"/            (ChangeSet current includesChangeForClass:cls) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1897
"/                (self confirm:('Nothing changed in %1 (repository unchanged).\\Remove entries from changeSet ?' bindWith:className) withCRs) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1898
"/                    ChangeSet current condenseChangesForClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1899
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1900
"/            ] ifFalse:[
1425
c02c03705574 be less chatty.
Claus Gittinger <cg@exept.de>
parents: 1424
diff changeset
  1901
"/                self information:('Nothing changed in %1 (repository unchanged)' bindWith:className).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1902
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1903
            self postCheckInClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1904
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1905
            changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1906
            (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1907
                'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1908
                cls updateVersionMethodFor:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1909
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1910
                entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1911
                newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1912
                cls updateVersionMethodFor:newString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1913
                cls revision ~= newRevision ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1914
                    'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1915
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1916
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1917
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1918
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1919
        ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1920
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1921
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1922
    Verbose == true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1923
        ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1924
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1925
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1926
    force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1927
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1928
            changeLog := self revisionLogOf:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1929
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1930
            changeLog := self revisionLogOf:cls fromRevision:(self revisionAfter:revision) toRevision:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1931
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1932
        changeLog notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1933
            s := WriteStream on:String new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1934
            self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1935
            changesAsLogged := s contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1936
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1937
            "/ mhmh - that should not happen
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1938
            changesAsLogged := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1939
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1940
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1941
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1942
    didMerge := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1943
    checkInRepaired := checkInNew := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1944
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1945
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1946
    "/ cvs above rel10 returns a multiline info ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1947
    "/ we have to extract the one line which states what happened.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1948
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1949
    whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1950
    whatHappened := whatHappened select:[:line |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1951
                        (line startsWith:'RCS file') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1952
                        and:[(line startsWith:'retrieving') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1953
                        and:[(line startsWith:'Merging') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1954
                        and:[line size > 0]]]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1955
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1956
    whatHappened := whatHappened asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1957
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1958
    (force or:[whatHappened startsWith:'M ']) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1959
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1960
        "/ merged in changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1961
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1962
        (force 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1963
        or:[changeLog isNil 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1964
        or:[(changeLog at:#revisions) isEmpty]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1965
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1966
            "/ pretty good - nothing has changed in the meanwhile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1967
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1968
            Transcript showCR:'checking in ' , className , ' ...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1969
        ] ifFalse:[
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1970
            |mySource mergedSource |
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1971
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1972
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1973
            "/ someone else has changed things in the meanwhile, but there is no conflict
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1974
            "/ and version have been merged.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1975
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1976
            didMerge := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1977
            changesAsLogged := changesAsLogged asCollectionOfLines.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1978
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1979
            s := WriteStream on:String new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1980
            cls fileOutOn:s withTimeStamp:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1981
            mySource := s contents asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1982
            mergedSource := (tempdir construct:checkoutName) readStream contents asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1983
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1984
            mySource = mergedSource ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1985
                msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1986
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1987
I have merged your version with the newest repository version, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1988
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1989
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1990
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1991
                self checkinTroubleDialog:'Merging versions'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1992
                               message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1993
                               log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1994
                               abortable:false 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1995
                               option:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1996
                didMerge := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1997
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1998
                msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1999
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2000
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2001
into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2002
into a new common revision which may be different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2003
Although this is a nice feature, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2004
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2005
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2006
most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2007
change methods as required and check in again. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2008
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2009
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2010
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2011
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2012
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2013
                answer := self checkinTroubleDialog:'Merging versions'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2014
                               message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2015
                               log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2016
                               abortable:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2017
                               option:'Stop - see first'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2018
                               option2:'Do NOT Merge - Force my Code'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2019
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2020
                answer == #option2 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2021
                    (Dialog confirm:'Are you certain that you want to suppress a merge and force your code to be checked in ?')
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2022
                    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2023
                        s := (tempdir construct:checkoutName) writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2024
                        cls fileOutOn:s withTimeStamp:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2025
                        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2026
                        answer := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2027
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2028
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2029
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2030
                answer ~~ true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2031
                    answer == #option ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2032
                        DiffTextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2033
                            openOn:mySource
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2034
                            label:'current version'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2035
                            and:mergedSource
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2036
                            label:'merged version'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2037
                            
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2038
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2039
                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2040
                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2041
                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2042
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2043
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2044
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2045
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2046
"/                msg := 'The source of ' , className , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2047
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2048
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2049
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2050
"/into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2051
"/into a new common revision which is different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2052
"/Although convenient, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2053
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2054
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2055
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2056
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2057
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2058
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2059
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2060
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2061
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2062
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2063
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2064
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2065
            Transcript showCR:'checking in ' , className , ' (merged other changes) ...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2066
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2067
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2068
        (whatHappened startsWith:'C ') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2069
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2070
            "/ conflict; someone else checked in something in the meanwhile,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2071
            "/ and there is a conflict between this version and the checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2072
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2073
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2074
            changesAsLogged := changesAsLogged asCollectionOfLines.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2075
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2076
            msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2077
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2078
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2079
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2080
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2081
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2082
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2083
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2084
            answer := self checkinTroubleDialog:'Version conflict'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2085
                 message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2086
                 log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2087
                 abortable:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2088
                 option:'Show conflicts'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2089
                 option2:'Resolve conflicts'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2090
                 option3:'Do NOT Merge - Force my Code'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2091
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2092
            answer == #option ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2093
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2094
                "/ show conflicts in a 3-way DiffTextView ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2095
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2096
                Diff3TextView
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2097
                    openOnMergedText:(tempdir construct:checkoutName) readStream contents 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2098
                    label:'your version (checkin attempt)' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2099
                    label:'original (base version)' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2100
                    label:'newest repository version'. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2101
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2102
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2103
            answer == #option2 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2104
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2105
                "/ allow checkin of repair version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2106
                "/ this is error prone ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2107
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2108
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2109
                "/ show merged version in an editor ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2110
                "/ ... accept will check it in.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2111
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2112
                emphasizedText := (tempdir construct:checkoutName) readStream contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2113
                emSep := (Array with:(#color->Color black)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2114
                             with:(#backgroundColor->Color green)).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2115
                emphasizedText := Diff3TextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2116
                            emphasizeMergedDiff3Text:emphasizedText 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2117
                            emphasize1:(Array with:(#color->Color white)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2118
                                              with:(#backgroundColor->Color blue))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2119
                            emphasize2:(Array with:(#color->Color white)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2120
                                              with:(#backgroundColor->Color red))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2121
                            emphasizeSep:emSep.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2122
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2123
                comment := 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2124
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2125
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2126
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2127
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2128
"/ Each such conflict is surrounded by green text (like this paragraph).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2129
"/ 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2130
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2131
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2132
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2133
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2134
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2135
                comment := (Text string:comment emphasis:emSep) asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2136
                emphasizedText := comment , emphasizedText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2137
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2138
                didAccept := false. checkInRepaired := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2139
                [didAccept not and:[checkInRepaired]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2140
                    editor := RCSConflictEditTextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2141
                                setupWith:emphasizedText
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2142
                                title:'Resolve conflicts in ' , className , ', then accept & close to checkin'.    
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2143
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2144
                    editor acceptAction:[:dummy |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2145
                        repairedText := editor list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2146
                        didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2147
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2148
                    didAccept := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2149
                    editor topView openModal.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2150
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2151
                    didAccept ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2152
                        (Dialog confirm:'You did not accept the new text. Edit again ?')
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2153
                        ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2154
                            checkInRepaired := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2155
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2156
                    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2157
                        "/ check if all green-stuff (separators) have been removed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2158
                        (repairedText findFirst:[:line | line notNil and:[line notEmpty and:[(line emphasisAt:1) = emSep]]]) ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2159
                            self warn:'You have to look at ALL conflicts, and remove ALL green lines as a confirmation !!'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2160
                            didAccept := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2161
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2162
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2163
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2164
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2165
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2166
                checkInRepaired ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2167
                    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2168
                        out := (tempdir construct:checkoutName) writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2169
                        out nextPutAll:(repairedText asString string).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2170
                        didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2171
                        out close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2172
                    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2173
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2174
                        checkInRepaired := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2175
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2176
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2177
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2178
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2179
            answer == #option3 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2180
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2181
                "/ force checkin of new version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2182
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2183
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2184
                "/ show merged version in an editor ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2185
                "/ ... accept will check it in.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2186
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2187
                [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2188
                    out := (tempdir construct:checkoutName) writeStream.
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  2189
                    cls fileOutOn:out withTimeStamp:false.
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  2190
                    out close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2191
                    didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2192
                    checkInNew := checkInRepaired := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2193
                ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2194
                    self warn:'could not write file ' , (tempdir constructString:checkoutName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2195
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2196
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2197
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2198
            checkInRepaired ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2199
                checkInNew ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2200
                    Transcript showCR:'checking in ' , className , ' (force new version)...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2201
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2202
                    Transcript showCR:'checking in ' , className , ' (manually repaired version)...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2203
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2204
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2205
                'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2206
                Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2207
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2208
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2209
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2210
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2211
            ((whatHappened startsWith:'U ') 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2212
            or:[ (whatHappened startsWith:'P ') ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2213
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2214
                "/ nothing changed here, but the repository already contains
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2215
                "/ a newer version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2216
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2217
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2218
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2219
                self information:'nothing changed in your ''' , className , ''';
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2220
but repository already contains a newer version (repository unchanged).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2221
                ^ true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2222
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2223
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2224
                "/ unexpected
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2225
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2226
                self warn:'unexpected message from CVS:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2227
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2228
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2229
No checkin performed.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2230
                Transcript showCR:'*** cannot checkin ' , className , ' (unexpected CVS response; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2231
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2232
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2233
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2234
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2235
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2236
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2237
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2238
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2239
    "/ now check it in again
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2240
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2241
    self activityNotification:'saving ' , cls name , ' in repository ...'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2242
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2243
    logMsg := logMsg replChar:$"  withString:'\"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2244
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2245
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2246
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2247
        logTmp := Filename newTemporaryIn:tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2248
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2249
        s nextPutAll:logMsg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2250
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2251
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2252
        cmd := 'commit -F "', logTmp baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2253
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2254
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2255
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2256
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2257
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2258
        cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"', cmdOut name, '"' , ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2259
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2260
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2261
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2262
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2263
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2264
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2265
        'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2266
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2267
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2268
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2269
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2270
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2271
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2272
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2273
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2274
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2275
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2276
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2277
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2278
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2279
        logTmp notNil ifTrue:[logTmp remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2280
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2281
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2282
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2283
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2284
    logTmp notNil ifTrue:[logTmp remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2285
    (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2286
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2287
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2288
        whatHappened := nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2289
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2290
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2291
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2292
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2293
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2294
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2295
    "/ fetch the new revision nr as found in the commit commands output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2296
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2297
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  2298
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2299
        'CVSSourceCodeManager [error]: unexpected empty checkin command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2300
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2301
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2302
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2303
        idx == 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2304
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2305
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2306
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2307
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2308
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2309
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2310
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2311
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2312
    "/ if there was no merge (i.e. the current version has been checked in unchanged):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2313
    "/   patch the classes revisionInfo (but keep binaryRevision unchanged) to the new revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2314
    "/   this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2315
    "/   the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2316
    "/   (however, the binaryRevision must remain as it is - we will need it to fetch the sourceCode
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2317
    "/    correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2318
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2319
    "/ if there was a merge (i.e. the repository now contains a merge of the current and some
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2320
    "/ other version):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2321
    "/    patch the classes revisionInfo (again, keep the binaryRevision) to the old revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2322
    "/    and add a 'm' (for merged).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2323
    "/    If we later checkin again, the new checkin will be again based on the current revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2324
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2325
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2326
        didMerge ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2327
            self activityNotification:'fetch new revision number of ', cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2328
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2329
            changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2330
            (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2331
                force ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2332
                    changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2333
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2334
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2335
            (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2336
                'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2337
                cls updateVersionMethodFor:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2338
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2339
                entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2340
                newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2341
                cls updateVersionMethodFor:newString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2342
                cls revision ~= newRevision ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2343
                    'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2344
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2345
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2346
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2347
            newString := self updatedRevisionStringOf:cls forRevision:nil with:cls revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2348
            cls updateVersionMethodFor:newString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2349
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2350
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2351
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2352
    Class addChangeRecordForClassCheckIn:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2353
    self postCheckInClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2354
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2355
    (checkInRepaired and:[checkInNew not]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2356
        self information:'Now the repository contains a merge between your and the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2357
However, the class in your image does NOT contain the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2358
This will lead to more conflict-resolving whenever you check this class in again later,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2359
unless you load the newest (merged) version of the class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2360
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2361
I recommend doing this as soon as possible via your browsers checkout function.'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2362
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2363
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2364
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2365
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2366
     SourceCodeManager checkinClass:Array logMessage:'testing only'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2367
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2368
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2369
    "Created: / 11.9.1996 / 16:16:11 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2370
    "Modified: / 26.2.1998 / 17:34:16 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2371
    "Modified: / 5.11.2001 / 14:35:38 / cg"
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2372
!
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2373
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2374
checkoutModule:aModule package:aPackage andDo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2375
    "check out everything from a package into a temporary directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2376
     Then evaluate aBlock, passing the name of that temp-directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2377
     Afterwards, the tempDir is removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2378
     Return true, if OK, false if any error occurred."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2379
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2380
    |cvsRoot packageDir tempdir cmdOut cmd dirName|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2381
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2382
    cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2383
    cvsRoot isNil ifTrue:[^ false ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2384
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2385
    aPackage notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2386
        dirName := aModule , '/' , aPackage.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2387
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2388
        dirName := aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2389
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2390
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2391
    self activityNotification:'checking out everything in ' , dirName , ' ...'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2392
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2393
    tempdir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2394
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2395
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2396
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2397
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2398
1393
28d04a5111c6 cvs V1.11.14 does not support the 'cvs -l' option any longer and breaks
Stefan Vogel <sv@exept.de>
parents: 1390
diff changeset
  2399
    cmd := 'checkout ', dirName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2400
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2401
        "/ can redirect output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2402
        cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2403
        cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2404
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2405
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2406
        cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2407
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2408
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2409
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2410
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2411
        module:aModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2412
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2413
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2414
        'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2415
        cmdOut notNil ifTrue:[cmdOut remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2416
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2417
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2418
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2419
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2420
    cmdOut notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2421
"/        listOfFiles := cmdOut contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2422
        cmdOut remove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2423
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2424
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2425
    packageDir := (tempdir construct:dirName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2426
    (packageDir isDirectory) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2427
        'CVSSourceCodeManager [error]: checkout failed (no dir)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2428
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2429
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2430
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2431
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2432
    "/ now, invoke the block ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2433
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2434
        aBlock value:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2435
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2436
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2437
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2438
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2439
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2440
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2441
    "Modified: / 28.4.1999 / 12:21:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2442
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2443
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2444
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheItArg
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2445
    "extract a source file and return an open readStream on it,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2446
     or nil if the extract failed. If revision is nil or (#newest), take
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2447
     the latest; otherwise, a specific revisions source is extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2448
     The cls argument is currently ignored, but may be used in future versions,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2449
     to validate the correct container against the class.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2450
     To check out a file (i.e. not a classes file), leave it nil."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2451
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2452
    |dir cachedSourceFilename cachedFile cmd fullName revisionArg stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2453
     checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2454
     classFileName cvsRoot tempFile revMsg cacheIt|
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2455
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2456
    cacheIt := cacheItArg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2457
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2458
    (DisabledModules notNil and:[DisabledModules includes:moduleDir]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2459
        Transcript showCR:'cvs access for module ' , moduleDir , ' has been disabled (due to previous failure)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2460
        Transcript showCR:'reenable using the launchers source&debugger dialog'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2461
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2462
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2463
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2464
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2465
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2466
    cvsRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2467
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2468
    "/ if not already existing, create a cache directory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2469
    "/ where we deposit sources.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2470
    "/ this is used as a cache for further requests, since
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2471
    "/ accessing the repository may be slow.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2472
    "/ (if cvs uses a remote connection via ppp, for example)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2473
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2474
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2475
    revision ~~ #newest ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2476
        (dir := self sourceCacheDirectory) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2477
            'CVSSourceCodeManager [warning]: no source cache directory' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2478
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2479
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2480
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2481
    classFileName := fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2482
    (classFileName endsWith:',v') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2483
        classFileName := classFileName copyWithoutLast:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2484
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2485
    (classFileName endsWith:'.st') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2486
        cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2487
            classFileName := classFileName copyWithoutLast:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2488
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2489
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2490
    fullName := moduleDir , '/' , packageDir , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2491
    cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2492
        fullName := fullName , '.st'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2493
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2494
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2495
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2496
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2497
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2498
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2499
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2500
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2501
    dir notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2502
        cachedFile := dir construct:cachedSourceFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2503
        cachedFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2504
"/            cachedFile fileSize < 10 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2505
"/                ('CVSSourceCodeManager [warning]: existing: ', cachedFile name , ' seems corrupted.') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2506
"/                cachedFile remove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2507
"/            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2508
"/            ('CVSSourceCodeManager [info]: found existing: ', cachedFile name) infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2509
                ^ cachedFile readStream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2510
"/            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2511
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2512
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2513
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2514
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2515
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2516
    "/ Do not make module and package directories, their existence cause cvs checkout to fail in server mode
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2517
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2518
    tempdir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2519
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2520
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout ' , classFileName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2521
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2522
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2523
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2524
"/    tempdir := Filename newTemporaryIn:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2525
"/    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2526
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2527
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2528
"/    tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2529
"/    dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2530
"/    dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2531
"/    dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2532
"/    dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2533
"/    dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2534
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2535
"/        'CVSMGR: cannot create temporary directory' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2536
"/        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2537
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2538
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2539
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2540
    "/ check it out there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2541
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2542
    checkoutName :=  fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2543
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2544
    checkoutNameLocal := (moduleDir asFilename construct:packageDir) constructString:(fullName asFilename baseName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2545
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2546
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2547
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2548
        revisionArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2549
        revMsg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2550
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2551
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2552
        revisionArg := ' -r ' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2553
        revMsg := ' (' , revision , ')'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2554
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2555
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2556
    self activityNotification:'checking out source ' , checkoutName , revMsg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2557
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2558
        "/ can redirect output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2559
        cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2560
        cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2561
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2562
        ].
1393
28d04a5111c6 cvs V1.11.14 does not support the 'cvs -l' option any longer and breaks
Stefan Vogel <sv@exept.de>
parents: 1390
diff changeset
  2563
        cmd := 'checkout' , revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2564
    ] ifFalse:[
1393
28d04a5111c6 cvs V1.11.14 does not support the 'cvs -l' option any longer and breaks
Stefan Vogel <sv@exept.de>
parents: 1390
diff changeset
  2565
        cmd := 'checkout' , revisionArg , ' ', checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2566
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2567
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2568
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2569
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2570
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2571
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2572
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2573
        'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2574
        cmdOut notNil ifTrue:[cmdOut remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2575
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2576
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2577
        "/ see if there is CVS access at all ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2578
        (self checkForExistingModule:moduleDir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2579
            "/ disable
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2580
            DisabledModules isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2581
                DisabledModules := Set new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2582
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2583
            DisabledModules add:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2584
            ('CVSSourceCodeManager [warning]: disabled repository access for module ' , moduleDir) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2585
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2586
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2587
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2588
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2589
    cmdOut notNil ifTrue:[cmdOut remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2590
    fullTempName := tempdir construct:checkoutNameLocal.
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2591
    CacheDirectoryName isNil ifTrue:[
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2592
        cacheIt := false
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2593
    ] ifFalse:[
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2594
        fullCachedName := CacheDirectoryName asFilename constructString:cachedSourceFilename.
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2595
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2596
    fullTempName exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2597
        ('CVSSourceCodeManager [error]: failed to checkout ', fullTempName pathName, ' (file does not exist after cvs co)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2598
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2599
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2600
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2601
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2602
    (cacheIt 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2603
    and:[cachedFile notNil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2604
    and:[fullTempName exists]])
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2605
    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2606
        (OperatingSystem errorSignal catch:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2607
            fullTempName moveTo:fullCachedName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2608
        ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2609
            ('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2610
            tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2611
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2612
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2613
        fullCachedName asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2614
            stream := fullCachedName asFilename readStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2615
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2616
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2617
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2618
            "/ cannot remove files which are still open ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2619
            "/ sigh - need a delete-on-close flag in FileStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2620
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2621
            tempFile := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2622
            fullTempName copyTo:tempFile.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2623
            stream := tempFile readStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2624
            stream notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2625
                stream removeOnClose:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2626
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2627
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2628
            stream := fullTempName readStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2629
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2630
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2631
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2632
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2633
    ^ stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2634
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2635
    "Created: / 4.11.1995 / 19:46:20 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2636
    "Modified: / 20.8.1997 / 16:37:11 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2637
    "Modified: / 23.8.2001 / 12:28:59 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2638
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2639
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2640
!CVSSourceCodeManager class methodsFor:'source code administration'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2641
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2642
checkForExistingContainerInModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2643
    "check for a container to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2644
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2645
    |fullName ret cvsRoot cmd tempDir|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2646
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2647
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2648
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2649
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2650
    RemoteCVS ifFalse:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  2651
        cvsRoot := self getCVSROOTForModule:moduleDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2652
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2653
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2654
            "/ with local CVS - simply check if that file exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2655
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2656
            (fullName endsWith:',v') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2657
                fullName := fullName , ',v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2658
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2659
            ^ (cvsRoot , '/' , fullName) asFilename exists.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2660
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2661
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2662
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2663
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2664
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2665
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2666
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2667
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2668
    (fullName endsWith:',v') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2669
        fullName := fullName copyWithoutLast:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2670
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2671
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2672
    cmd := '-n rtag -l -F dummy '.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2673
    [  
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2674
        |errorStream|
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2675
        errorStream := '' writeStream.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2676
        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2677
        ret := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2678
                    executeCVSCommand:cmd , fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2679
                    module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2680
                    "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2681
                    "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2682
                    "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2683
                    inDirectory:(tempDir pathName) 
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2684
                    log:false
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2685
                    errorTo:errorStream.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2686
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2687
        "cannot check for exit status starting at cvs 1.11.5, because an exit status 0
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2688
         is returned even if the file does not exist"
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2689
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2690
        "But: if there is any output, the command failed and the container does not exist"
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2691
        ret := errorStream size == 0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2692
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2693
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2694
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2695
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2696
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2697
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2698
     CVSSourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2699
        checkForExistingContainerInModule:'stx' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2700
        package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2701
        container:'Integer.st'     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2702
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2703
     CVSSourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2704
        checkForExistingContainerInModule:'stx' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2705
        package:'libtool' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2706
        container:'AboutBox.st'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2707
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2708
     CVSSourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2709
        checkForExistingContainerInModule:'stx' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2710
        package:'libtool' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2711
        container:'AboutBox.st,v'     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2712
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2713
     CVSSourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2714
        checkForExistingContainerInModule:'stx' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2715
        package:'libtool' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2716
        container:'FooBar.st'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2717
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2718
     CVSSourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2719
        checkForExistingContainerInModule:'DPU' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2720
        package:'test' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2721
        container:'marks'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2722
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2723
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2724
    "Created: / 9.12.1995 / 19:13:37 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2725
    "Modified: / 1.3.1999 / 19:32:55 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2726
    "Modified: / 23.7.1999 / 17:36:58 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2727
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2728
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2729
checkForExistingModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2730
    "check for a module to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2731
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2732
    |ret cvsRoot cmd tempDir|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2733
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2734
    self activityNotification:'checking for existing module ' , moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2735
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2736
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2737
    cvsRoot isNil ifTrue:[^ false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2738
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2739
    RemoteCVS ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2740
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2741
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2742
            "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2743
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2744
            ^ (cvsRoot , '/' , moduleDir) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2745
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2746
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2747
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2748
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2749
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2750
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2751
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2752
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2753
    cmd := '-n rtag -l dummy '.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2754
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2755
        ret := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2756
                    executeCVSCommand:cmd , moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2757
                    module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2758
                    "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2759
                    "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2760
                    "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2761
                    inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2762
                    log:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2763
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2764
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2765
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2766
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2767
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2768
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2769
     CVSSourceCodeManager checkForExistingModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2770
     CVSSourceCodeManager checkForExistingModule:'DPU'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2771
     CVSSourceCodeManager checkForExistingModule:'cg'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2772
     CVSSourceCodeManager checkForExistingModule:'aeg' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2773
     CVSSourceCodeManager checkForExistingModule:'foo'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2774
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2775
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2776
    "Created: / 9.12.1995 / 19:13:37 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2777
    "Modified: / 1.3.1999 / 19:32:59 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2778
    "Modified: / 23.7.1999 / 17:38:59 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2779
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2780
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2781
checkForExistingModule:moduleDir package:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2782
    "check for a package to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2783
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2784
    |ret cvsRoot cmd tempDir fullName |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2785
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2786
    self activityNotification:'checking for existing package ' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2787
1365
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  2788
    cvsRoot := self getCVSROOTForModule:moduleDir.
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  2789
    cvsRoot isNil ifTrue:[^ false].
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  2790
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2791
    fullName := moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2792
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2793
    RemoteCVS ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2794
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2795
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2796
            "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2797
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2798
            ^ (cvsRoot , '/' , fullName) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2799
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2800
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2801
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2802
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2803
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2804
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2805
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2806
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2807
    cmd := '-n rtag -l -F dummy '.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2808
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2809
        ret := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2810
                    executeCVSCommand:cmd, fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2811
                    module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2812
                    "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2813
                    "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2814
                    "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2815
                    inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2816
                    log:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2817
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2818
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2819
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2820
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2821
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2822
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2823
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2824
     CVSSourceCodeManager checkForExistingModule:'stx' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2825
     CVSSourceCodeManager checkForExistingModule:'aeg' package:'libProgram'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2826
     CVSSourceCodeManager checkForExistingModule:'foo' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2827
     CVSSourceCodeManager checkForExistingModule:'foo' package:'bar'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2828
     CVSSourceCodeManager checkForExistingModule:'cg' package:'private'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2829
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2830
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2831
    "Created: / 9.12.1995 / 19:13:37 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2832
    "Modified: / 1.3.1999 / 19:33:04 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2833
    "Modified: / 23.7.1999 / 17:39:21 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2834
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2835
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2836
createContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2837
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2838
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2839
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2840
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2841
     changeLog entry newString startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2842
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2843
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2844
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2845
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2846
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2847
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2848
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2849
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2850
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2851
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2852
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2853
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2854
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2855
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2856
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2857
    self activityNotification:'checking for directory ' , checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2858
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2859
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2860
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2861
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2862
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2863
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2864
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2865
    "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2866
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2867
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2868
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2869
        aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2870
    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2871
        ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2872
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2873
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2874
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2875
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2876
    Class fileOutErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2877
        'CVSSourceCodeManager [error]: fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2878
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2879
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2880
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2881
    ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2882
        aClass fileOutOn:aStream withTimeStamp:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2883
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2884
    aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2885
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2886
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2887
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2888
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2889
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2890
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2891
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2892
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2893
    "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2894
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2895
    self activityNotification:'adding ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2896
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2897
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2898
        checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2899
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2900
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2901
            checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2902
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2903
            self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2904
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2905
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2906
    cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2907
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2908
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2909
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2910
        inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2911
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2912
        'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2913
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2914
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2915
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2916
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2917
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2918
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2919
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2920
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2921
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2922
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2923
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2924
    self activityNotification:'committing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2925
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2926
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2927
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2928
        logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2929
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2930
        s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2931
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2932
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2933
        cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' > ', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2934
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2935
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2936
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2937
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2938
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2939
        cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2940
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2941
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2942
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2943
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2944
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2945
        inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2946
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2947
        Verbose == true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2948
            'CVSMGR: failed to execute: ' infoPrint. cmd infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2949
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2950
        cmdOut fileSize > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2951
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2952
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2953
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2954
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2955
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2956
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2957
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2958
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2959
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2960
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2961
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2962
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2963
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2964
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2965
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2966
    whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2967
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2968
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2969
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2970
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2971
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2972
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2973
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2974
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2975
    "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2976
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  2977
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2978
        'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2979
        "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2980
        "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2981
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2982
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2983
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2984
        idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2985
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2986
            startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2987
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2988
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2989
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2990
                'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2991
                startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2992
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2993
                'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2994
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2995
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2996
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2997
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2998
            endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2999
            endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3000
                endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3001
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3002
            newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3003
            (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3004
                newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3005
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3006
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3007
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3008
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3009
    Transcript showCR:'created new sourceContainer for ' , aClass name , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3010
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3011
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3012
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3013
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3014
    "/ the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3015
    "/ (however, the binaryRevision must remain as it is - we will need it to fetch the sourceCode
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3016
    "/  correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3017
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3018
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3019
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3020
        changeLog := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3021
                        revisionLogOf:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3022
                        fromRevision:newRevision 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3023
                        toRevision:newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3024
                        fileName:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3025
                        directory:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3026
                        module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3027
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3028
        (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3029
            'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3030
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3031
            entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3032
            newString := self revisionStringFromLog:changeLog entry:entry forClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3033
            aClass updateVersionMethodFor:newString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3034
            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3035
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3036
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3037
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3038
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3039
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3040
    Class addChangeRecordForClassCheckIn:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3041
    self postCheckInClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3042
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3043
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3044
    "Created: / 9.12.1995 / 19:13:37 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3045
    "Modified: / 23.7.1999 / 19:47:59 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3046
    "Modified: / 5.11.2001 / 14:22:56 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3047
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3048
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3049
createContainerForText:someText inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3050
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3051
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3052
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3053
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3054
     startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3055
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3056
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3057
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3058
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3059
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3060
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3061
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3062
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3063
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3064
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3065
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3066
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3067
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3068
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3069
    self activityNotification:'checking for directory ' , checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3070
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3071
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3072
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3073
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3074
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3075
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3076
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3077
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3078
        "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3079
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3080
        tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3081
        [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3082
            aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3083
        ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3084
            ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3085
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3086
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3087
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3088
        aStream nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3089
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3090
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3091
        tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3092
            'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3093
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3094
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3095
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3096
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3097
        "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3098
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3099
        self activityNotification:'adding ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3100
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3101
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3102
            checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3103
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3104
            OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3105
                checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3106
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3107
                self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3108
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3109
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3110
        cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3111
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3112
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3113
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3114
            inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3115
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3116
            'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3117
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3118
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3119
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3120
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3121
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3122
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3123
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3124
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3125
        "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3126
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3127
        self activityNotification:'committing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3128
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3129
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3130
            "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3131
            logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3132
            s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3133
            s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3134
            s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3135
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3136
            cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' >', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3137
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3138
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3139
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3140
            "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3141
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3142
            cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3143
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3144
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3145
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3146
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3147
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3148
            inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3149
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3150
            Verbose == true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3151
                'CVSMGR: failed to execute: ' infoPrint. cmd infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3152
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3153
            cmdOut fileSize > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3154
                whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3155
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3156
                whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3157
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3158
            self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3159
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3160
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3161
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3162
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3163
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3164
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3165
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3166
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3167
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3168
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3169
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3170
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3171
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3172
        "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3173
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3174
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3175
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3176
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3177
        "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3178
        "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3179
        (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3180
            'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3181
            "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3182
            "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3183
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3184
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3185
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3186
            idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3187
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3188
                startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3189
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3190
                idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3191
                idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3192
                    'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3193
                    startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3194
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3195
                    'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3196
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3197
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3198
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3199
                l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3200
                endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3201
                endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3202
                    endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3203
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3204
                newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3205
                (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3206
                    newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3207
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3208
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3209
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3210
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3211
        Transcript showCR:'created new sourceContainer for ' , fileName , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3212
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3213
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3214
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3215
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3216
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3217
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3218
createModule:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3219
    "create a module directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3220
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3221
    |tempdir moduleDir cmdOut cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3222
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3223
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3224
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3225
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3226
    tempdir := self createTempDirectory:nil forModule:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3227
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3228
        ('CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3229
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3230
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3231
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3232
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3233
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3234
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3235
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3236
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3237
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3238
    "/ create the module directory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3239
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3240
    moduleDir := tempdir construct:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3241
    moduleDir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3242
        'CVSSourceCodeManager [error]: failed to create: ' errorPrint.  moduleDir name errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3243
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3244
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3245
    ].     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3246
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3247
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3248
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3249
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3250
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3251
    cmd := 'import -m "created from browser" ' , moduleName , ' initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3252
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3253
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3254
        module:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3255
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3256
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3257
        'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3258
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3259
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3260
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3261
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3262
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3263
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3264
    'CVSSourceCodeManager [info]: created new module: ' infoPrint. moduleName infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3265
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3266
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3267
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3268
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3269
    "Created: / 9.12.1995 / 19:53:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3270
    "Modified: / 7.1.1998 / 14:18:57 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3271
    "Modified: / 6.6.1998 / 16:15:34 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3272
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3273
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3274
createModule:moduleDirName package:packageDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3275
    "create a package directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3276
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3277
    |tempdir cmdOut cmd packageDir moduleDir relativePath idx parentPackage|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3278
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3279
    "/ any parent package required ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3280
    idx := packageDirName lastIndexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3281
    idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3282
        parentPackage := packageDirName copyTo:idx-1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3283
        (self checkForExistingModule:moduleDirName package:parentPackage) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3284
            (self createModule:moduleDirName package:parentPackage) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3285
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3286
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3287
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3288
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3289
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3290
    (moduleDirName asFilename components includes:'core') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3291
        ('CVSSourceCodeManager [error]: cvs does not allow for a module to be named ''core'' - cannot create moduleDirectory') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3292
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3293
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3294
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3295
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3296
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3297
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3298
    tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3299
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3300
        ('CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3301
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3302
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3303
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3304
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3305
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3306
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3307
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3308
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3309
    moduleDir := tempdir construct:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3310
    moduleDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3311
        'CVSSourceCodeManager [error]: command failed: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3312
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3313
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3314
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3315
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3316
        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3317
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3318
    "/ create the package directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3319
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3320
    packageDir := moduleDir construct:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3321
    OperatingSystem errorSignal catch:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3322
        packageDir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3323
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3324
    packageDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3325
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3326
        ('CVSSourceCodeManager [error]: cannot create new directory: ' , packageDir pathName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3327
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3328
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3329
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3330
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3331
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3332
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3333
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3334
    relativePath := moduleDirName asFilename constructString:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3335
    cmd := 'import -m "created from browser" . initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3336
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3337
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3338
        module:moduleDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3339
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3340
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3341
        'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3342
        'CVSSourceCodeManager [error]: output from cvs:' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3343
        (cmdOut contentsOfEntireFile) errorPrint.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3344
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3345
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3346
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3347
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3348
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3349
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3350
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3351
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3352
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3353
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3354
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3355
      self createModule:'stefan' package:'dummy1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3356
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3357
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3358
    "Created: / 9.12.1995 / 20:09:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3359
    "Modified: / 23.7.1999 / 18:40:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3360
    "Modified: / 18.1.2000 / 20:14:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3361
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3362
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3363
deleteSymbolicName:symbolicName fileName:classFileName directory:packageDir module:moduleDir
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3364
    "remove symbolicName from classFileName"
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3365
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3366
    self setSymbolicName:symbolicName revision:0 overWrite:false fileName:classFileName directory:packageDir module:moduleDir
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3367
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3368
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3369
        self deleteSymbolicName:'stable' fileName:'Array.st' directory:'libbasic' module:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3370
        self deleteSymbolicName:'testBLAbla' fileName:nil directory:'libbasic' module:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3371
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3372
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3373
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3374
getExistingContainersInModule:aModule package:aPackage
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3375
    "return a list of existing containers."
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3376
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3377
    ^ self listDirectories:aModule, '/', aPackage
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3378
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3379
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3380
     CVSSourceCodeManager getExistingContainersInModule:'stx' package:'libhtml'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3381
     CVSSourceCodeManager getExistingContainersInModule:'cg'  package:'java'
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3382
     CVSSourceCodeManager getExistingContainersInModule:'exept' package:'osi'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3383
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3384
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3385
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3386
getExistingModules
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3387
    "return a list of existing modules"
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3388
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3389
    ^ self listDirectories:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3390
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3391
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3392
     CVSSourceCodeManager getExistingModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3393
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3394
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3395
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3396
getExistingPackagesInModule:aModule
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3397
    "return a list of existing packages."
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3398
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3399
    ^ self listDirectories:aModule.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3400
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3401
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3402
     CVSSourceCodeManager getExistingPackagesInModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3403
     CVSSourceCodeManager getExistingPackagesInModule:'cg'
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3404
     CVSSourceCodeManager getExistingPackagesInModule:'exept'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3405
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3406
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3407
    "Created: / 20.5.1998 / 19:28:43 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3408
    "Modified: / 20.5.1998 / 22:07:13 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3409
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3410
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3411
initialRevisionStringFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3412
    "return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3413
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3414
    |cvsRoot|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3415
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3416
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3417
    cvsRoot := self repositoryTopDirectory:cvsRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3418
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3419
        initialRCSRevisionStringFor:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3420
        in:(cvsRoot , '/' , moduleDir , '/' , packageDir)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3421
        container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3422
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3423
    "Modified: / 19.9.1997 / 06:34:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3424
    "Modified: / 16.1.1998 / 17:34:13 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3425
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3426
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3427
listDirectories:cvsPath
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3428
    "return a list of all directories in cvsPath.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3429
     cvsPath is the path relative to the cvs root"
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3430
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3431
    |cvsRoot directories inStream line|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3432
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3433
    cvsRoot := self getCVSROOTForModule:nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3434
    cvsRoot isNil ifTrue:[^ #()].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3435
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3436
    self activityNotification:'getting list of directories...'.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3437
    directories := Set new.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3438
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3439
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3440
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3441
                        executeCVSCommand:('rls -l ' , (cvsPath ? '')) 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3442
                        module:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3443
                        inDirectory:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3444
                        log:false 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3445
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3446
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3447
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3448
            self warn:'This operation is not possible with this remoteCVS server'.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3449
            ^ #().
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3450
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3451
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3452
        [line := inStream nextLine. line notNil] whileTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3453
            |idx|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3454
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3455
            "/ 'd--- 2005-06-02 17:21:20 +0200 Eigene Dateien'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3456
        
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3457
            (line startsWith:$d) ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3458
                idx := 0.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3459
                4 timesRepeat:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3460
                    idx := line indexOf:Character space startingAt:idx+1.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3461
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3462
                directories add:(line copyFrom:idx+1) withoutSeparators
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3463
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3464
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3465
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3466
        inStream notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3467
            inStream close.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3468
        ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3469
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3470
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3471
    ^ directories asArray sort
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3472
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3473
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3474
     CVSSourceCodeManager listDirectories:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3475
     CVSSourceCodeManager listDirectories:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3476
     CVSSourceCodeManager listDirectories:'stx/libbasic'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3477
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3478
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3479
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3480
newestRevisionInFile:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3481
    "return the newest revision found in a container.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3482
     Return nil on failure."
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3483
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3484
    |tempDir fullName modulePath inStream line s|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3485
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3486
    modulePath :=  moduleDir , '/' , packageDir. 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3487
    fullName :=  modulePath , '/' , classFileName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3488
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3489
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3490
        self activityNotification:'Fetching revision info for ', fullName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3491
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3492
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3493
                        executeCVSCommand:('rlog -h -N ' , fullName) 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3494
                        module:moduleDir 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3495
                        inDirectory:tempDir 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3496
                        log:true 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3497
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3498
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3499
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3500
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', fullName) errorPrintCR.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3501
            ^ nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3502
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3503
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3504
        "/
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3505
        "/ read the commands pipe output and extract the container info
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3506
        "/
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3507
        [inStream atEnd] whileFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3508
            line:= inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3509
            line notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3510
                line := line withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3511
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3512
            line notEmpty ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3513
                s := line restAfter:'head:' withoutSeparators:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3514
                s notNil ifTrue:[ |i|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3515
                    i := s indexOfSeparator.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3516
                    i ~~ 0 ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3517
                        s := s copyTo:i-1
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3518
                    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3519
                    ^ s
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3520
                ].                        
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3521
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3522
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3523
        ('CVSSourceCodeManager [warning]: no revision for ', fullName) errorPrintCR.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3524
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3525
        inStream notNil ifTrue:[inStream close].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3526
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3527
    ^ nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3528
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3529
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3530
     SourceCodeManager newestRevisionInFile:'Array.st' directory:'libbasic' module:'stx'       
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3531
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3532
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3533
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3534
removeContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3535
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3536
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3537
    (self removeContainerInModule:moduleDir package:packageDir container:fileName) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3538
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3539
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3540
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3541
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3542
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3543
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3544
    "/ some container-less class.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3545
    "/ (however, the binaryRevision must remain as it is - we will need it to fetch the sourceCode
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3546
    "/  correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3547
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3548
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3549
    aClass updateVersionMethodFor:'no longer in repository'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3550
    Class addChangeRecordForClassContainerRemove:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3551
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3552
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3553
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3554
removeContainerInModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3555
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3556
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3557
    |fullName tempdir checkoutName cmdOut cmd tempFile whatHappened|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3558
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3559
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3560
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3561
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3562
    (tempdir := self createLocalDirectory:packageDir inModule:moduleDir with:fileName) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3563
        'CVSSourceCodeManager [error]: failed to checkout: ' errorPrint. checkoutName errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3564
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3565
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3566
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3567
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3568
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3569
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3570
    "/ and remove it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3571
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3572
    self activityNotification:'removing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3573
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3574
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3575
    "/ check presence of source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3576
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3577
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3578
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3579
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3580
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3581
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3582
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3583
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3584
    tempFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3585
        tempFile remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3586
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3587
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3588
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3589
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3590
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3591
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3592
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3593
    cmd := 'remove ' , fileName , ' > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3594
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3595
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3596
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3597
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3598
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3599
        'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3600
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3601
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3602
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3603
        ('CVSSourceCodeManager [error]: cannot remove ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3604
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3605
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3606
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3607
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3608
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3609
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3610
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3611
    self activityNotification:'committing removal of ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3612
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3613
    cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3614
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3615
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3616
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3617
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3618
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3619
        'CVSSourceCodeManager [error]: failed to execute: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3620
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3621
        cmdOut fileSize > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3622
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3623
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3624
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3625
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3626
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3627
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3628
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3629
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3630
The container has NOT been removed into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3631
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3632
       'CVSSourceCodeManager [error]: cannot remove container' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3633
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3634
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3635
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3636
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3637
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3638
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3639
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3640
    "/ release the temporary tree towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3641
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3642
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3643
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3644
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3645
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3646
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3647
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3648
     CVSSourceCodeManager removeContainerInModule:'stx' package:'private' container:'WorldPO.st'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3649
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3650
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3651
    "Modified: / 26.2.1998 / 17:33:57 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3652
    "Modified: / 18.1.2000 / 21:02:30 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3653
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3654
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3655
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep filterModules:filterModules inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3656
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3657
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3658
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3659
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3660
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3661
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3662
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3663
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3664
    |inStream line words recordType fileName user date time rev pkgDir module idx
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3665
     clsName cls clsRev roots info tempDir endReached|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3666
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3667
    CVSRoot isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3668
        'CVSSourceCodeManager [info]: CVSROOT not set' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3669
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3670
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3671
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3672
    CVSModuleRoots notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3673
        roots := Set withAll:(CVSModuleRoots values)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3674
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3675
        roots := Set new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3676
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3677
    roots add:CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3678
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3679
    "/ must do it in a tempDir, to avoid cvs validating the -D arg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3680
    "/ against any info found in CVS/Root
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3681
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3682
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3683
    tempDir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3684
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3685
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3686
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3687
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3688
    roots do:[:aCVSRoot |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3689
        |root host cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3690
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3691
        cmd := 'cvs -d ' , aCVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3692
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3693
        "/ workaround a CVS bug ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3694
        "/ cvs crashes with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3695
        "/   cvs -d exept:/files/CVS history -x WARM -a -D "yesterday"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3696
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3697
        "/ but works ok, when doing:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3698
        "/   rsh exept cvs -d /files/CVS history -x WARM -a -D "yesterday"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3699
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3700
        (aCVSRoot startsWith:':') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3701
            OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3702
                host := aCVSRoot copyTo:(aCVSRoot indexOf:$:)-1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3703
                (host size > 0 and:[(host includes:Character space) not]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3704
                    root := aCVSRoot copyFrom:(aCVSRoot indexOf:$:)+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3705
                    cmd := 'rsh ' , host , ' cvs -d ' , root    
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3706
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3707
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3708
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3709
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3710
        cmd := cmd , ' history -x WARM -a'.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3711
        (timeGoal notEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3712
            cmd := cmd , ' -D "' , timeGoal , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3713
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3714
        filterRep notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3715
            filterRep do:[:aRepository |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3716
                cmd := cmd , ' -p "' , aRepository , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3717
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3718
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3719
        userFilter notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3720
            userFilter isString ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3721
                cmd := cmd , ' -u "' , userFilter , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3722
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3723
                userFilter do:[:user |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3724
                    cmd := cmd , ' -u "' , user , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3725
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3726
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3727
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3728
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3729
"/ either I dont understand CVS, or it does not work correctly...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3730
"/ in any case, the -m option does NOT filter modules. (sigh)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3731
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3732
"/        filterModules notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3733
"/            filterModules do:[:aModule |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3734
"/                cmd := cmd , ' -m "' , aModule , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3735
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3736
"/        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3737
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3738
        Transcript showCR:cmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3739
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3740
        inStream := PipeStream readingFrom:cmd inDirectory:tempDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3741
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3742
            ('CVSSourceCodeManager [error]: cannot open pipe to ''cvs history''') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3743
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3744
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3745
            inStream class streamErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3746
                ('CVSSourceCodeManager [error]: pipe read error (''cvs history'')') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3747
                ex return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3748
            ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3749
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3750
                "/ read the commands pipe output and reformat the lines
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3751
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3752
                endReached := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3753
                [endReached] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3754
                    inStream readWait.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3755
                    line := inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3756
                    (endReached := line isNil) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3757
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3758
                        "/ cvs history line is of the following format:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3759
                        "/ [Ma] date time +xxx user rev name module/package ....
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3760
                        words := line asCollectionOfWords.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3761
                        words size >= 8 ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3762
                            "/ something like 'No records selected' ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3763
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3764
                        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3765
                            recordType := words at:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3766
                            fileName := words at:7.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3767
                            user := words at:5.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3768
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3769
                            (filter not 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3770
                            or:[fileName endsWith:'.st']) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3771
                                (userFilter isNil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3772
                                or:[userFilter = user]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3773
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3774
                                    date := words at:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3775
                                    time := words at:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3776
                                    rev := words at:6.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3777
                                    pkgDir := words at:8.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3778
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3779
                                    module := pkgDir copy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3780
                                    (module startsWith:'./') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3781
                                        module := module copyFrom:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3782
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3783
                                    idx := module indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3784
                                    idx ~~ 0 ifTrue:[    
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3785
                                        module at:idx put:$:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3786
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3787
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3788
                                    (filterModules isNil 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3789
                                    or:[filterModules includes:module]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3790
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3791
                                        recordType = 'M' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3792
                                            recordType := ' '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3793
                                        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3794
                                            recordType = 'A' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3795
                                                recordType := '+'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3796
                                            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3797
                                                (recordType = 'R' or:[recordType = 'W']) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3798
                                                    recordType := '-'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3799
                                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3800
                                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3801
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3802
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3803
                                        info := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3804
                                        info at:#cvsRecordType       put:recordType.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3805
                                        info at:#date                put:date.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3806
                                        info at:#time                put:time.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3807
                                        info at:#user                put:user.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3808
                                        info at:#fileName            put:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3809
                                        info at:#revision            put:rev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3810
                                        info at:#directory           put:pkgDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3811
                                        info at:#className           put:(Smalltalk classNameForFile:fileName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3812
                                    
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3813
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3814
                                        "/ for your convenience:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3815
                                        "/  check what the actual version is in the image
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3816
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3817
                                        clsName := Smalltalk classNameForFile:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3818
                                        clsName notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3819
                                            cls := Smalltalk classNamed:clsName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3820
                                            (cls notNil and:[(clsRev := cls revision) notNil]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3821
                                                info at:#classesRevision     put:clsRev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3822
                                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3823
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3824
                                        aBlock value:info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3825
                                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3826
                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3827
                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3828
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3829
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3830
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3831
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3832
            inStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3833
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3834
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3835
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3836
    tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3837
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3838
    "Created: / 17.1.2001 / 13:11:20 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3839
    "Modified: / 17.1.2001 / 13:41:22 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3840
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3841
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3842
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3843
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3844
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3845
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3846
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3847
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3848
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3849
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3850
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3851
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3852
        reportHistoryLogSince:timeGoal 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3853
        filterSTSources:filter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3854
        filterUser:userFilter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3855
        filterRepository:filterRep 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3856
        filterModules:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3857
        inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3858
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3859
    "Modified: / 17.1.2001 / 13:12:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3860
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3861
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3862
revisionInfoFromString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3863
    "{ Pragma: +optSpace }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3864
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3865
    "return a dictionary filled with revision info.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3866
     This extracts the relevant info from aString."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3867
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3868
    ^ self revisionInfoFromRCSString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3869
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3870
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3871
     self revisionInfoFromString:(Array version)   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3872
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3873
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3874
    "Modified: 29.1.1997 / 19:00:35 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3875
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3876
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3877
revisionLogOf:clsOrNil fromRevision:firstRev toRevision:lastRef fileName:classFileName directory:packageDir module:moduleDir 
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3878
    ^ self 
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3879
        revisionLogOf:clsOrNil
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3880
        fromRevision:firstRev
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3881
        toRevision:lastRef
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3882
        numberOfRevisions:nil
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3883
        fileName:classFileName
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3884
        directory:packageDir
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3885
        module:moduleDir
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3886
!
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3887
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3888
revisionLogOf:clsOrNil fromRevision:firstRev toRevision:lastRef numberOfRevisions:numRevisions fileName:classFileName directory:packageDir module:moduleDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3889
    "return info about the repository container and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3890
     (part of) the revisionlog as a collection of revision entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3891
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3892
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3893
     If numRevisions is notNil, it limits the number of revision records returned -
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3894
     only numRevions of the newest revision infos will be collected.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3895
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3896
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3897
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3898
            #container          -> the RCS/CVS container file name 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3899
            #cvsRoot            -> the CVS root (repository) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3900
            #filename           -> the actual source file name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3901
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3902
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3903
            #revisions          -> collection of per-revision info (see below)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3904
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3905
            firstRev / lastRef specify from which revisions a logEntry is wanted:
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3906
             -If firstRev is nil, the first revision is the initial revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3907
              otherwise, the log starts with that revision.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3908
             -If lastRef is nil, the last revision is the newest revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3909
              otherwise, the log ends with that revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3910
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3911
             -If both are nil, all logEntries are extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3912
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3913
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3914
            per revision info consists of one record per revision:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3915
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3916
              #revision              -> the revision string
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3917
              #author                -> who checked that revision into the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3918
              #date                  -> when was it checked in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3919
              #state                 -> the RCS state
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3920
              #numberOfChangedLines  -> the number of changed line w.r.t the previous
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3921
              #logMessage            -> the checkIn log message
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3922
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3923
            revisions are ordered newest first 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3924
            (i.e. the last entry is for the initial revision; the first for the most recent one)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3925
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3926
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3927
    |tempDir fullName modulePath inStream inHeaderInfo atEnd line revArg idx
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3928
     info record revisionRecords s headerOnly msg|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3929
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3930
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3931
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3932
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3933
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3934
        revArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3935
        headerOnly := false.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3936
        (firstRev notNil or:[lastRef notNil]) ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3937
            (firstRev == 0 and:[lastRef == 0]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3938
                revArg := '-h'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3939
                headerOnly := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3940
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3941
                revArg := '-r'.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3942
                firstRev notNil ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3943
                    revArg := revArg , firstRev
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3944
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3945
                revArg := revArg , ':'.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3946
                lastRef notNil ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3947
                    revArg := revArg , lastRef
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3948
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3949
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3950
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3951
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3952
        headerOnly ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3953
            msg := 'fetching revision info '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3954
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3955
            msg := 'reading revision log '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3956
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3957
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3958
            msg := msg , 'in ' , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3959
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3960
            msg := msg , 'of ', clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3961
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3962
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3963
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3964
        inStream := self 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3965
                        executeCVSCommand:('rlog ' , revArg , ' ' , fullName) 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3966
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3967
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3968
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3969
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3970
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3971
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3972
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3973
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3974
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3975
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3976
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3977
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3978
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3979
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3980
        inHeaderInfo := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3981
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3982
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3983
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3984
                |gotIt|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3985
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3986
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3987
                #('RCS file:'        #container
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3988
                  'Working file:'    #filename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3989
                  'head:'            #newestRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3990
                  'total revisions:' #numberOfRevisions
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3991
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3992
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3993
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3994
                        s notNil ifTrue:[info at:key put:s. gotIt := true].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3995
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3996
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3997
                gotIt ifFalse:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3998
                    (line startsWith:'symbolic names:') ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  3999
                        |tags tokens|
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4000
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4001
                        tags := Dictionary new.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4002
                        line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4003
                        [line notNil 
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4004
                         and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4005
                            tokens := line asCollectionOfSubstringsSeparatedBy:$:.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4006
                            tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4007
                            line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4008
                        ].
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4009
                        info at:#symbolicNames put:tags.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4010
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4011
                    (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4012
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4013
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4014
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4015
        inStream nextLine. "/ skip separating line after description.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4016
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4017
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4018
            ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4019
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4020
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4021
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4022
        "/ strip selected revisions from the total-revisions entry
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4023
        s := info at:#numberOfRevisions.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4024
        (idx := s indexOf:$;) ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4025
            info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4026
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4027
            info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4028
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4029
        headerOnly ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4030
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4031
            "/ continue to read the commands pipe output 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4032
            "/ and extract revision info records
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4033
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4034
            revisionRecords := OrderedCollection new:(info at:#numberOfRevisions).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4035
            info at:#revisions put:revisionRecords.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4036
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4037
            atEnd := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4038
            [atEnd or:[inStream atEnd]] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4039
                record := self readRevisionLogEntryFromStream:inStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4040
                record isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4041
                    atEnd := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4042
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4043
                    revisionRecords add:record.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4044
                ].
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4045
                (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4046
                    atEnd := true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4047
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4048
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4049
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4050
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4051
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4052
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4053
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4054
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4055
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4056
     SourceCodeManager revisionLogOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4057
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4058
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4059
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4060
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4061
     SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4062
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4063
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4064
    "Created: / 16.11.1995 / 13:25:30 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4065
    "Modified: / 29.1.1997 / 16:51:30 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4066
    "Modified: / 27.8.1998 / 12:40:59 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4067
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4068
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4069
revisionLogOf:clsOrNil numberOfRevisions:numRevisions fileName:classFileName directory:packageDir module:moduleDir
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4070
    ^ self 
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4071
        revisionLogOf:clsOrNil
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4072
        fromRevision:nil
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4073
        toRevision:nil
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4074
        numberOfRevisions:numRevisions
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4075
        fileName:classFileName
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4076
        directory:packageDir
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4077
        module:moduleDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4078
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4079
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4080
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool fileName:filename directory:packageDir module:moduleDir
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4081
    "set a symbolicName for revision rev.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4082
     If rev is nil, set it for the head (most recent) revision.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4083
     If rev is 0, delete the symbolic name.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4084
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4085
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4086
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4087
     If filename is nil, the symbolicName for a whole package is set"
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4088
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4089
    |fullName modulePath inStream argumentString result tempDir errorStream outStream|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4090
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4091
    modulePath :=  moduleDir , '/' , packageDir.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4092
    filename notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4093
        fullName :=  modulePath , '/' , filename.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4094
    ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4095
        fullName := modulePath.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4096
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4097
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4098
    rev = 0 ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4099
        argumentString := ' -d '.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4100
    ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4101
        argumentString := ' -r ', (rev ? 'HEAD').
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4102
        overWriteBool ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4103
            argumentString := argumentString, ' -F'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4104
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4105
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4106
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4107
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4108
        self activityNotification:'setting symbolic name ', fullName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4109
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4110
        errorStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4111
        outStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4112
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4113
        result := self  executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', fullName) 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4114
                        module:moduleDir 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4115
                        inDirectory:tempDir 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4116
                        log:true
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4117
                        outputTo:outStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4118
                        errorTo:errorStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4119
        (result not or:[errorStream size ~~ 0]) ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4120
            SourceCodeManagerError raiseWith:errorStream contents errorString:' cvs tag failed: ', fullName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4121
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4122
        (outStream contents asStringCollection contains:[:eachLine| eachLine startsWithAnyOf:'WE']) ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4123
            SourceCodeManagerError raiseWith:outStream contents errorString:' cvs tag could not be set: ', fullName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4124
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4125
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4126
        inStream notNil ifTrue:[inStream close].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4127
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4128
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4129
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4130
        self setSymbolicName:'stable' revision:nil overWrite:false fileName:'Array.st' directory:'libbasic' module:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4131
        self setSymbolicName:'stable' revision:nil overWrite:true fileName:'Array.st' directory:'libbasic' module:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4132
        self setSymbolicName:'stable' revision:nil overWrite:true fileName:nil directory:'libbasic' module:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4133
        self setSymbolicName:'stable' revision:'1.1' overWrite:true fileName:'Array.st' directory:'libbasic' module:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4134
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4135
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4136
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4137
statusOf:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4138
    "return info about the status repository container.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4139
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4140
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4141
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4142
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4143
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4144
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4145
     This is much faster than revisionLog info (especially, if there are many revisions),
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4146
     and all we need is a classes newest version number.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4147
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4148
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4149
    |tempDir fullName modulePath inStream line   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4150
     info s msg|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4151
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4152
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4153
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4154
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4155
    tempDir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4156
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4157
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4158
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4159
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4160
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4161
        self createEntryFor:fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4162
             module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4163
             in:(tempDir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4164
             revision:'1.1' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4165
             date:'dummy' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4166
             special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4167
             overwrite:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4168
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4169
        msg := 'fetching status info of '.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4170
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4171
            msg := msg , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4172
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4173
            msg := msg , clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4174
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4175
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4176
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4177
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4178
                        executeCVSCommand:('status ' , fullName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4179
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4180
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4181
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4182
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4183
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4184
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4185
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4186
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4187
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4188
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4189
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4190
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4191
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4192
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4193
        [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4194
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4195
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4196
                line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4197
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4198
            line size > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4199
                |gotIt i|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4200
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4201
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4202
                #(
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4203
                  'Repository revision:'  #newestRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4204
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4205
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4206
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4207
                        s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4208
                            i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4209
                            i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4210
                                s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4211
                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4212
                            info at:key put:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4213
                            gotIt := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4214
                        ].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4215
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4216
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4217
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4218
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4219
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4220
            ('CVSSourceCodeManager [warning]: no status for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4221
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4222
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4223
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4224
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4225
        tempDir recursiveRemove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4226
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4227
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4228
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4229
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4230
     SourceCodeManager statusOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4231
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4232
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4233
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4234
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4235
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4236
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4237
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4238
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4239
version
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4240
    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.297 2006-02-22 22:07:08 stefan Exp $'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4241
! !
1170
Claus Gittinger <cg@exept.de>
parents: 1159
diff changeset
  4242
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  4243
CVSSourceCodeManager initialize!