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