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