CVSSourceCodeManager.st
author Claus Gittinger <cg@exept.de>
Sat, 14 Jan 2012 21:19:43 +0100
changeset 2721 427b55df02fb
parent 2701 9f53f037ec00
child 2726 84aaf535d6c3
permissions -rw-r--r--
changed: #cvsTmpDirectory #cvsTmpDirectory:
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
"{ Package: 'stx:libbasic3' }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    13
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    14
AbstractSourceCodeManager subclass:#CVSSourceCodeManager
2171
0981a71a0dc6 changed:
fm
parents: 2162
diff changeset
    15
	instanceVariableNames:''
0981a71a0dc6 changed:
fm
parents: 2162
diff changeset
    16
	classVariableNames:'Verbose CVSRoot RemoteCVS CVSModuleRoots CMD_checkout CVSTempDir
0981a71a0dc6 changed:
fm
parents: 2162
diff changeset
    17
		DisabledModules CVSCommandSemaphore CVSExecutable
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
    18
		CVSCommitOptions CVSUpdateOptions CVSCommandTimeout
2701
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
    19
		RecentlyCheckedModulesAndPackages ShownInBrowserMenus'
2171
0981a71a0dc6 changed:
fm
parents: 2162
diff changeset
    20
	poolDictionaries:''
0981a71a0dc6 changed:
fm
parents: 2162
diff changeset
    21
	category:'System-SourceCodeManagement'
1362
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).
1736
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    86
        Therefore, server-mode CVS is not supported.
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    87
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    88
    Comment:
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
    89
        The code here is a copy-paste mess; it definitely needs some cleanup...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    90
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    91
    [class variables:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    92
        CVSTempDir      <String | nil>  where a directory tree is
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    93
                                        generated temporarily for checkin/checkout
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
    94
                                        (default is nil -> systems tmp-dir)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    95
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    96
        CVSRoot         <String>        the CVS root. Imported from the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    97
                                        CVSROOT shell variable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    98
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
    99
        RemoteCVS       <Boolean>       if true, remote CVS access is used
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   100
                                        (i.e. via a socket to a CVS server).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   101
                                        if false, disk access is used;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   102
                                        files in CVSRoot must be accessable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   103
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   104
        CVSWorkDirectory                not yet supported/implemented.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   105
                                        PLANNED: name of a directory hierarchy,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   106
                                        which is kept in sync with the current
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   107
                                        version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   108
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   109
        CVSBinDir                       where the CVS commands are found
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   110
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   111
        CVSModuleRoots  <Directory>     per-module roots.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   112
                                        If empty, or no entry is found for a
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   113
                                        module is found, CVSRoot is used.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   114
                                        Otherwise, specifies a per-module CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   115
                                        (allows multiple CVS hierarchies)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   116
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   117
    [author:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   118
        Claus Gittinger
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   120
    [see also:]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   121
        ( cvs manual page :man: cvs )
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   122
        ( Coding style used in Smalltalk/X classes :html: programming/codingStyle.html )
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'.
1874
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   194
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   195
    "Modified: / 13-10-2006 / 00:44:13 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   196
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   197
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   198
initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   199
    "check if $CVSROOT (the shell variable) or CVSRoot (the smalltalk global)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   200
     is set, check if cvs commands can be executed and install myself as the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   201
     SourceCodeManager if this works out ok"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   202
1929
4081e9216069 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1917
diff changeset
   203
    | s f top ok cvsCmd |
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   204
2475
f5eb4f468ae3 comment/format
Claus Gittinger <cg@exept.de>
parents: 2449
diff changeset
   205
    CVSCommandSemaphore := Semaphore new:10.    "/ at most 10 cvs activities concurrently
2010
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   206
    CVSCommitOptions := ''.
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   207
    CVSUpdateOptions := ''.
1465
b28d95c4f867 *** empty log message ***
sr
parents: 1464
diff changeset
   208
    RemoteCVS := true.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   209
    DisabledModules := nil.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   210
    CVSModuleRoots isNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   211
        CVSModuleRoots := Dictionary new.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   212
    ].
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   213
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   214
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   215
    "/ if CVSROOT is non-empty and both cvs and co are available
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   216
    "/ as commands, assume this system uses a cvs source code management.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   217
    "/
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   218
    CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   219
        CVSRoot := OperatingSystem getEnvironment:'CVSROOT'.
1929
4081e9216069 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1917
diff changeset
   220
        CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   221
            "disabled since $CVSROOT is not set"
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   222
            ^ self
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   223
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   224
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   225
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   226
    cvsCmd := self cvsExecutable.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   227
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   228
    ok := OperatingSystem canExecuteCommand:cvsCmd.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   229
    ok ifFalse:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   230
        'CVSSourceCodeManager [warning]: disabled because no >>cvs<< command was found' infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   231
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   232
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   233
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   234
    UseWorkTree := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   235
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   236
    CacheDirectoryName isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   237
        self initCacheDirPath.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   238
    ].
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   239
    CachingSources isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   240
        CachingSources := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   241
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   242
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   243
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   244
    "/ check if there is an stx directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   245
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   246
    ((f := CVSRoot asFilename) isDirectory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   247
    and:[(top := f construct:'stx') isDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   248
    and:[top isReadable]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   249
        RemoteCVS := false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   250
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   251
1493
079d236141ef leave SourceCodeManager uninitialized
Michael Beyl <mb@exept.de>
parents: 1489
diff changeset
   252
"/    Smalltalk at:#SourceCodeManager put:self.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   253
    DefaultManager := self.    
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   254
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   255
    ('CVSSourceCodeManager [info]: repository CVSROOT is ''' , CVSRoot , '''.') infoPrintCR.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   256
    RemoteCVS ifFalse:[
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   257
        'CVSSourceCodeManager [info]: using faster local CVS mode' infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   258
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   259
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   260
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   261
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   262
    "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   263
    "/ if non-nil, a working tree is kept there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   264
    "/ and updated/commited files are not removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   265
    "/ If you use a regular (make-) tree, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   266
    "/ set WorkTreeDirectoryName (or the environment variable) to that.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   267
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   268
    "/ this is not yet finished.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   269
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   270
    s := OperatingSystem getEnvironment:'STX_WORKTREE'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   271
    s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   272
        WorkTreeDirectoryName := s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   273
        UseWorkTree := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   274
    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   275
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   276
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   277
     AbstractSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   278
     CVSSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   279
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   280
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   281
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   282
     CVSRoot := '/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   283
     AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   284
     CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   285
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   286
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   287
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   288
     CVSRoot := ':pserver:cg@cvs.bh.exept.de:/cvs/stx'.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   289
     AbstractSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   290
     CVSSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   291
     SourceCodeManager := CVSSourceCodeManager.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   292
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   293
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   294
    "Created: / 04-11-1995 / 19:14:38 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   295
    "Modified: / 19-12-1995 / 14:25:46 / stefan"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   296
    "Modified: / 21-09-2006 / 16:44:52 / cg"
2475
f5eb4f468ae3 comment/format
Claus Gittinger <cg@exept.de>
parents: 2449
diff changeset
   297
    "Modified (comment): / 17-08-2011 / 10:11:01 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   298
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   299
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   300
initializeForRepository:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   301
    "set the global CVSROOT directory (i.e. the repositories name).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   302
     And reinitialize. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   303
     Can be used from the launcher to change/configure the repository."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   304
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   305
    self repositoryName:aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   306
    AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   307
    CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   308
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   309
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   310
     CVSSourceCodeManager initializeForRepository:'/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   311
     CVSSourceCodeManager initializeForRepository:'ibm:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   312
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   313
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   314
    "Created: / 13.8.1997 / 17:20:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   315
    "Modified: / 25.9.1997 / 12:28:05 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   316
    "Modified: / 2.11.1997 / 17:08:27 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   317
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   318
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   319
!CVSSourceCodeManager class methodsFor:'accessing'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   320
2011
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   321
CVSCommitOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   322
    ^ CVSCommitOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   323
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   324
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   325
CVSCommitOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   326
    CVSCommitOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   327
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   328
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   329
CVSUpdateOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   330
    ^ CVSUpdateOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   331
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   332
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   333
CVSUpdateOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   334
    CVSUpdateOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   335
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   336
1809
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   337
cvsBinDirectory:ignoredString
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   338
    "ignored - for backward compatibility (to read old settings files)"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   339
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   340
    "Created: / 21-09-2006 / 17:26:43 / cg"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   341
!
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   342
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   343
cvsCommandTimeout
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   344
    ^ CVSCommandTimeout ? ("360" 120 seconds)
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   345
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   346
    "Modified (comment): / 08-01-2012 / 19:02:44 / cg"
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   347
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   348
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   349
cvsCommandTimeout:aTimeDuration
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   350
    CVSCommandTimeout := aTimeDuration asTimeDuration.
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   351
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   352
    "Created: / 08-01-2012 / 19:36:01 / cg"
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   353
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   354
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   355
cvsExecutable
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   356
    "return the name of the cvs executable."
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   357
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   358
    ^ CVSExecutable ? 'cvs'
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   359
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   360
    "Created: / 21-09-2006 / 15:31:12 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   361
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   362
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   363
cvsExecutable:aString
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   364
    "set the name of the cvs executable."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   365
1829
bc9065af3347 *** empty log message ***
ca
parents: 1813
diff changeset
   366
    aString isEmptyOrNil ifTrue:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   367
        CVSExecutable := nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   368
    ] ifFalse:[        
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   369
        CVSExecutable := aString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   370
    ].
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   371
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   372
    "Created: / 21-09-2006 / 15:31:59 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   373
    "Modified: / 21-09-2006 / 16:41:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   374
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   375
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   376
cvsTmpDirectory
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   377
    "return the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   378
     That's the directory, where temporary files are created for checkin/checkout.
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   379
     If nil, the systems default tempDirectory is used."
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   380
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   381
    ^ (CVSTempDir ? Filename tempDirectory pathName)
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   382
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   383
    "
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   384
     CVSTempDir := nil   
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   385
    "
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   386
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   387
    "Modified (comment): / 14-01-2012 / 20:54:06 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   388
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   389
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   390
cvsTmpDirectory:aPathNameString
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   391
    "set the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   392
     That's the directory, where temporary files are created for checkin/checkout.
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   393
     If nil, the systems default tempDirectory is used."
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   394
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   395
    CVSTempDir := aPathNameString
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   396
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   397
    "Modified (comment): / 14-01-2012 / 20:54:11 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   398
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   399
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   400
knownModules
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   401
    "return the modules, we currently know"
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   402
2686
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   403
    CVSModuleRoots isEmptyOrNil ifTrue:[^ #() ].
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   404
    ^ CVSModuleRoots keys
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   405
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   406
    "Modified: / 26-12-2011 / 00:49:03 / cg"
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   407
!
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   408
1482
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   409
knownRepositories
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   410
    "return the modules, we currently know"
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   411
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   412
    ^ CVSModuleRoots values copyWith:CVSRoot 
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   413
!
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   414
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   415
repositoryForPackage:packageId
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   416
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   417
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   418
    ^self getCVSROOTForModule: ( packageId upTo:$:)
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   419
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   420
    "Modified: / 10-10-2011 / 19:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   421
!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   422
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   423
repositoryInfoPerModule
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   424
    "return the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   425
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   426
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   427
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   428
    ^ CVSModuleRoots ? #()
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   429
!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   430
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   431
repositoryInfoPerModule:aDictionary
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   432
    "set the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   433
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   434
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   435
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   436
    CVSModuleRoots := aDictionary
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   437
!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   438
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   439
repositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   440
    "return the name of the global repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   441
     This is used, if no per-module repository is defined."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   442
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   443
    ^ CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   444
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   445
    "Created: 14.9.1996 / 13:22:05 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   446
    "Modified: 19.9.1997 / 06:12:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   447
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   448
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   449
repositoryName:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   450
    "set the name of the repository;
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   451
     that's the name of the global CVSROOT directory, which is used 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   452
     if no specific repository was defined for a module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   453
     Can be used from an rc-script, to override the CVSROOT shell 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   454
     variable setting."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   455
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   456
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   457
    CVSRoot := aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   458
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   459
    "Created: / 14-09-1996 / 13:22:24 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   460
    "Modified: / 19-09-1997 / 06:10:31 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   461
    "Modified (comment): / 21-12-2011 / 14:54:15 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   462
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   463
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   464
repositoryName:aRepositoryName forModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   465
    "set the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   466
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   467
     This can be used from an rc-script, to specify a repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   468
     for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   469
     If left unspecified, the global (i.e. fallBack) repository is used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   470
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   471
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   472
    CVSModuleRoots at:aModuleName put:aRepositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   473
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   474
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   475
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   476
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   477
repositoryNameForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   478
    "return the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   479
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   480
     Nil is returned for unspecified moduleRoots; in this case, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   481
     the global (i.e. fallBack) repository will be used for source access."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   482
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   483
    ^ CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   484
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   485
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   486
    "Created: 19.9.1997 / 06:13:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   487
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   488
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   489
repositoryNameForPackage:packageId 
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   490
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   491
    
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   492
    ^ self getCVSROOTForModule:(packageId upTo:$: )
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   493
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   494
    "Created: / 10-10-2011 / 19:44:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   495
    "Modified (format): / 21-12-2011 / 23:03:29 / cg"
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   496
!
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   497
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   498
repositoryNamesPerModule
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   499
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   500
    "return the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   501
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   502
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   503
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   504
    self obsoleteMethodWarning:'use repositoryInfoPerModule'.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   505
    ^ CVSModuleRoots 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   506
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   507
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   508
repositoryNamesPerModule:aDictionary
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   509
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   510
    "set the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   511
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   512
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   513
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   514
    self obsoleteMethodWarning:'use repositoryInfoPerModule:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   515
    CVSModuleRoots := aDictionary
2701
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   516
!
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   517
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   518
shownInBrowserMenus
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   519
    ^ ShownInBrowserMenus ? true
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   520
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   521
    "Created: / 08-01-2012 / 19:53:20 / cg"
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   522
!
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   523
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   524
shownInBrowserMenus:aBoolean
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   525
    ShownInBrowserMenus := aBoolean
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   526
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
   527
    "Created: / 08-01-2012 / 19:53:34 / cg"
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   528
! !
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   529
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   530
!CVSSourceCodeManager class methodsFor:'basic administration'!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   531
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   532
createContainerFor:aClass inModule:moduleName directory:dirName container:fileName
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   533
    "create a new container & check into it an initial version of aClass"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   534
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   535
    ^ self shouldImplement
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   536
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   537
1992
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   538
!CVSSourceCodeManager class methodsFor:'debugging'!
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   539
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   540
verboseSourceCodeAccess
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   541
    ^ Verbose ? false
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   542
!
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   543
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   544
verboseSourceCodeAccess:aBoolean
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   545
    Verbose := aBoolean
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   546
! !
ff25162d9e24 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1991
diff changeset
   547
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   548
!CVSSourceCodeManager class methodsFor:'misc operations'!
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   549
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   550
changeCVSRoot:newRootString inDirectoryTree:aDirectoryFilename
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   551
    "WARNING: read and understand before executing !!
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   552
     Change the CVS root to newRootString (something like:':pserver:user@cvs.bh.exept.de:/cvs/stx').
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   553
     This is done by rewriting all files named CVS/Root below the given path.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   554
     aDirectoryFilename is recursively descended"
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   555
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   556
    aDirectoryFilename asFilename allDirectoriesDo:[:eachDirectoryName|
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   557
        eachDirectoryName baseName = 'CVS' ifTrue:[
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   558
            self activityNotification:eachDirectoryName pathName.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   559
            (eachDirectoryName construct:'Root') writeStream 
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   560
                nextPutLine:newRootString;
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   561
                close.
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   562
        ].
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   563
    ].
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   564
    self activityNotification:nil.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   565
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   566
    "OperatingSystem getLoginName
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   567
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   568
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   569
        inDirectoryTree:'../../../stx'
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   570
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   571
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   572
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   573
        inDirectoryTree:'..\..\..\exept'
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   574
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   575
     self 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   576
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   577
        inDirectoryTree:'..\..\..\cg'
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   578
    "
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   579
! !
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   580
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   581
!CVSSourceCodeManager class methodsFor:'private'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   582
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   583
checkOut:relativeFilename module:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   584
    "checkout realtiveFilename in tempdir"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   585
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   586
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   587
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   588
    cmd := 'checkout -l ' , relativeFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   589
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   590
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   591
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   592
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   593
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   594
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   595
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   596
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   597
      self checkOut:'stx/libbasic/Integer.st' asFilename in:'/tmp' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   598
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   599
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   600
    "Created: / 18.1.2000 / 20:30:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   601
    "Modified: / 18.1.2000 / 20:35:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   602
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   603
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   604
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   605
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   606
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   607
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   608
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   609
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   610
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   611
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   612
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   613
        option2:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   614
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   615
    "Created: 10.12.1995 / 17:34:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   616
    "Modified: 12.9.1996 / 02:39:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   617
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   618
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   619
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   620
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   621
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   622
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   623
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   624
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   625
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   626
        option2:optionTitle2 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   627
        option3:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   628
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   629
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   630
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   631
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   632
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   633
    |l box list listView optionPressed option2Pressed option3Pressed|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   634
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   635
    l := log collect:[:line | line withTabsExpanded].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   636
    list := SelectionInList with:l.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   637
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   638
    box := Dialog new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   639
    box label:(title).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   640
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   641
    (box addTextLabel:message) borderWidth:0.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   642
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   643
    listView := SelectionInListView on:list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   644
    listView disable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   645
    listView height:200.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   646
    box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   647
    box addVerticalSpace.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   648
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   649
    abortable ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   650
        box addAbortButton
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   651
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   652
    optionTitle notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   653
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   654
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   655
    optionTitle2 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   656
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   657
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   658
    optionTitle3 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   659
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   660
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   661
    box addOkButton.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   662
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   663
    box extent:(box preferredExtent).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   664
    box minExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   665
    box maxExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   666
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   667
    box open.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   668
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   669
    box destroy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   670
    optionPressed == true ifTrue:[^ #option].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   671
    option2Pressed == true ifTrue:[^ #option2].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   672
    option3Pressed == true ifTrue:[^ #option3].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   673
    ^ box accepted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   674
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   675
    "Created: 9.9.1996 / 19:12:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   676
    "Modified: 12.9.1996 / 02:39:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   677
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   678
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   679
createEntryFor:pathInRepository module:aModule in:aDirectory revision:rev date:date special:special overwrite:overwrite
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   680
    "create an CVS/Repository and CVS/Entries entry for filename. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   681
     If the path does not exist, it will be created
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   682
     If overwrite is true, an existing Entry will be overwritten.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   683
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   684
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   685
    |filename cvsRoot cvsDir name entries firstPart s path|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   686
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   687
    filename := pathInRepository asFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   688
    cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   689
    entries := cvsDir construct:'Entries'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   690
    name := filename baseName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   691
    firstPart := '/', name, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   692
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   693
    s := entries readStreamOrNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   694
    s isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   695
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   696
        "/ no Repository yet, create one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   697
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   698
        |index root|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   699
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   700
        cvsRoot := self getCVSROOTForModule:aModule.
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   701
        root := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   702
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   703
        "/ create Repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   704
        "/ (notice, contents must be a Unix filename ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   705
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   706
        s := (cvsDir construct:'Repository') writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   707
        path := Filename components:filename directory name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   708
        path := path asStringWith:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   709
        s nextPutLine:(root, '/', path).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   710
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   711
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   712
        "/ make new Entries file.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   713
        s := entries writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   714
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   715
        |newName newStream line|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   716
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   717
        newName := Filename newTemporaryIn:cvsDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   718
        newStream := newName writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   719
        [(line := s nextLine) notNil] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   720
            (line findString:firstPart) ~= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   721
                "/ we have found an entry for ourself.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   722
                "/ If we do not want to overwrite it, clean up everything and return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   723
                overwrite ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   724
                    newName remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   725
                    newStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   726
                    s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   727
                    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   728
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   729
                newStream nextPutLine:line
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   730
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   731
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   732
        newName renameTo:entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   733
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   734
        s := newStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   735
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   736
    s nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   737
    s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   738
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   739
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   740
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   741
        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
   742
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   743
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   744
    "Created: / 19-09-1997 / 06:21:02 / cg"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   745
    "Modified: / 07-01-1998 / 14:15:35 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   746
    "Modified: / 21-06-2006 / 12:13:30 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   747
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   748
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   749
createLocalDirectory:packageDir inModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   750
    "create a local working directory for module/package.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   751
     To speed up things, we checkout the file '.cvsignore', to create
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   752
     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
   753
     Return the name of a temporary directory containing the package"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   754
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   755
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   756
        createLocalDirectory:packageDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   757
        inModule:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   758
        with:'.cvsignore'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   759
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   760
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   761
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   762
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   763
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   764
    "Created: / 23.7.1999 / 19:14:28 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   765
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   766
    "Modified: / 18.1.2000 / 20:56:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   767
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   768
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   769
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   770
    "create a local working directory for module/package, and checkout the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   771
     given file there.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   772
     Return the name of a temporary directory containing the package, or nil"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   773
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   774
    |path absolutePath tempdir workingDir unixPath|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   775
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   776
    path := (moduleDir asFilename construct:packageDir) construct:fileToCheckout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   777
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   778
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   779
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   780
        ('no tempDir - cannot checkout') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   781
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   782
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   783
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   784
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   785
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   786
            unixPath := path name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   787
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   788
            OperatingSystem isVMSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   789
                self error:'VMS case not yet implemented'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   790
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   791
            unixPath := path name copy replaceAll:$\ with:$/
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
        (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   795
            "dummy file does not exist, so create it"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   796
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   797
            absolutePath := tempdir construct:path.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   798
            absolutePath directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   799
            "now create the file"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   800
            (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   801
                ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   802
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   803
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   804
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   805
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   806
            "now create the dummy file in the repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   807
            (self import:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   808
                ('CVSSourceCodeManager [error]: cannot import dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   809
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   810
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   811
            "remove the path, so that checkout works"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   812
            (tempdir construct:moduleDir) recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   813
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   814
            "checkout the dummy, the intermediate directories will be created"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   815
            (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   816
                ('CVSSourceCodeManager [warning]: import failed (to create working dir)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   817
"/false ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   818
"/                "/ manually create it
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   819
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   820
"/                (tempdir construct:unixPath) directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   821
"/                workingDir := tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   822
"/                unixPath asFilename directory components do:[:each |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   823
"/                    self executeCVSCommand:('add ' , each) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   824
"/                    workingDir := workingDir construct:each.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   825
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   826
"/                (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   827
"/                    ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   828
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   829
"/                    ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   830
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   831
"/                self executeCVSCommand:('add ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   832
"/                self executeCVSCommand:('commit ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   833
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   834
"/                ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   835
"/].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   836
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   837
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   838
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   839
        ].
1406
725a5b2866f2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1405
diff changeset
   840
    ] ifCurtailed:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   841
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   842
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   843
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   844
    ^ tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   845
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   846
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   847
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   848
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   849
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   850
    "Modified: / 26-07-1999 / 17:43:35 / stefan"
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   851
    "Created: / 18-01-2000 / 20:55:52 / cg"
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   852
    "Modified: / 29-08-2006 / 13:17:32 / cg"
1362
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
createTempDirectory:packageDir forModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   856
    "create a temp directory for checking out"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   857
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   858
    |tempdir dir|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   859
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   860
    "/ if CVSTempDir isNil, use current.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   861
    OperatingSystem errorSignal handle:[:ex |
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   862
        self reportError:('cannot create temporary directory').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   863
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   864
    ] do:[
1803
f6080a5418b1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1790
diff changeset
   865
        tempdir := Filename newTemporaryDirectoryIn:(self cvsTmpDirectory).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   866
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   867
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   868
    moduleDir notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   869
        dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   870
        dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   871
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   872
        packageDir notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   873
            dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   874
            dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   875
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   876
        dir exists ifFalse:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   877
            (tempdir construct:moduleDir) recursiveRemove.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   878
            tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   879
            self reportError:('cannot create temporary directory').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   880
            ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   881
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   882
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   883
    ^ tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   884
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   885
    "self createTempDirectory:'fooPackage' forModule:'fooModule'"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   886
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   887
    "Created: / 09-12-1995 / 19:14:35 / cg"
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   888
    "Modified: / 19-12-1995 / 16:13:02 / stefan"
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   889
    "Modified: / 29-08-2006 / 13:16:23 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   890
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   891
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   892
cvsTimeString:timestamp
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   893
    "convert a Timestamp to a string suitable for the CVS/Entries file:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   894
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   895
                         123456789012345678901234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   896
                         Tue Dec 19 20:56:26 1995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   897
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   898
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   899
    ^ timestamp printStringFormat:'%(ShortDayName) %(ShortMonthName) %(day) %h:%m:%s %(year)' language:#en.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   900
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   901
    "
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   902
     CVSSourceCodeManager cvsTimeString:(UtcTimestamp now)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   903
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   904
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   905
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   906
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   907
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   908
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   909
     This also leads to a log-entry to be added to cvs's logfile."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   910
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   911
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   912
        executeCVSCommand:cvsCommand 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   913
        module:moduleName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   914
        inDirectory:dir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   915
        log:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   916
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   917
    "Modified: / 20.5.1998 / 16:07:28 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   918
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   919
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   920
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   921
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   922
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   923
     The doLog argument, if false supresses a logEntry to be added 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   924
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   925
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   926
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   927
        executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   928
        pipe:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   929
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   930
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   931
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
   932
    ^ self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   933
        executeCVSCommand:cvsCommand
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   934
        module:moduleName
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   935
        inDirectory:dirArg
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   936
        log:doLog
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   937
        outputTo:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   938
        errorTo:errorStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   939
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   940
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   941
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
   942
    "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
   943
     execute command in the dirArg directory.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   944
     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
   945
     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
   946
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   947
    |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
   948
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   949
    dirArg notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   950
        dir := dirArg asFilename.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   951
        pathOfDir := dir pathName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   952
    ].
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   953
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   954
    cvsRoot := self getCVSROOTForModule:moduleName.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   955
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   956
    "JV@2011-10-13: Try to be foolproof and set CVS_RSH on Windows"
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   957
    OperatingSystem isMSWINDOWSlike ifTrue:[
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   958
        (OperatingSystem getEnvironment:'CVS_RSH') isNil ifTrue:[
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   959
            (OperatingSystem canExecuteCommand: 'plink') ifTrue:[
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   960
                OperatingSystem setEnvironment: 'CVS_RSH' to: 'plink'
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   961
            ]
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   962
        ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   963
    ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   964
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   965
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   966
    command := self cvsExecutable.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   967
    (command includes:Character space) ifTrue:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   968
        command := '"' , command , '"'        
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   969
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   970
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   971
    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
   972
"/ 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
   973
"/        command := command , ' -l'.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   974
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   975
    command := command , ' -d "', cvsRoot, '" ', cvsCommand.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   976
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   977
    Verbose == true ifTrue:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   978
        ('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
   979
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   980
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   981
    Processor isDispatching ifFalse:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   982
        rslt := ok := OperatingSystem executeCommand:command 
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   983
                                inputFrom:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   984
                                outputTo:outStream 
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   985
                                errorTo:errorStream 
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   986
                                auxFrom:nil
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   987
                                inDirectory:pathOfDir
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   988
                                lineWise:false
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   989
                                onError:[:status| false].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   990
    ] ifTrue:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   991
        p := [
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   992
            rslt := ok := OperatingSystem executeCommand:command
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   993
                                inputFrom:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   994
                                outputTo:outStream 
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   995
                                errorTo:errorStream 
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   996
                                auxFrom:nil
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   997
                                inDirectory:pathOfDir
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   998
                                lineWise:false
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   999
                                onError:[:status| false].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1000
        ] fork.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1001
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1002
        (p waitUntilTerminatedWithTimeout:300) ifTrue:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1003
            ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1004
            ^ false
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1005
        ]. 
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1006
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1007
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1008
    ok ifFalse:[
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1009
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1010
    ].
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1011
    ^ rslt
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1012
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1013
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1014
    "Created: / 20-05-1998 / 16:06:34 / cg"
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
  1015
    "Modified: / 21-09-2006 / 16:39:21 / cg"
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1016
    "Modified: / 13-10-2011 / 17:07:07 / jv"
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1017
!
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  1018
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1019
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1020
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1021
     execute command in the dirArg directory.
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1022
     The doLog argument, if false supresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1023
     in the cvs log file (used when reading / extracting history)"
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1024
    
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1025
    |command cvsRoot rslt ok pathOfDir errorString|
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1026
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1027
    dirArg notNil ifTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1028
        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
  1029
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1030
    cvsRoot := self getCVSROOTForModule:moduleName.
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1031
    command := self cvsExecutable.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1032
    (command includes:Character space) ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1033
        command := '"' , command , '"'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1034
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1035
    doLog ifFalse:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1036
        "/ cvs  1.11.14 fails with -l option
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1037
        "/        command := command , ' -l'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1038
    ].
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1039
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1040
    "JV@2011-10-13: Try to be foolproof and set CVS_RSH on Windows"
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1041
    OperatingSystem isMSWINDOWSlike ifTrue:[
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1042
        (OperatingSystem getEnvironment:'CVS_RSH') isNil ifTrue:[
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1043
            (OperatingSystem canExecuteCommand: 'plink') ifTrue:[
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1044
                OperatingSystem setEnvironment: 'CVS_RSH' to: 'plink'
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1045
            ]
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1046
        ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1047
    ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1048
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1049
    command := command , ' -d "' , cvsRoot , '" ' , cvsCommand.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1050
    Verbose == true ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1051
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1052
            , (pathOfDir ? '.') , ']') 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1053
            infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1054
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1055
    doPipe ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1056
        rslt := PipeStream 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1057
                    readingFrom:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1058
                    errorDisposition:#inline
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1059
                    inDirectory:pathOfDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1060
        ok := rslt notNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1061
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1062
        Processor isDispatching ifFalse:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1063
            rslt := ok := OperatingSystem 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1064
                                executeCommand:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1065
                                errorTo:nil
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1066
                                inDirectory:pathOfDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1067
        ] ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1068
            CVSCommandSemaphore 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1069
                critical:[
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1070
                    |p errOut done|
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1071
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1072
                    errOut := WriteStream on:String new.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1073
                    p := [
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1074
                                rslt := ok := OperatingSystem 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1075
                                                    executeCommand:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1076
                                                    errorTo:errOut
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1077
                                                    inDirectory:pathOfDir.
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1078
                         ] fork.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1079
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1080
                    done := false.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1081
                    [done] whileFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1082
                        done := true.
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1083
                        (p waitUntilTerminatedWithTimeout:self cvsCommandTimeout asSeconds) ifTrue:[
2701
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
  1084
                            (Dialog confirm:('CVS command timeout (%1) for:\\%2\\Proceed?' withCRs 
2696
b07662eb1f51 changed: #executeCVSCommand:module:inDirectory:log:pipe:
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1085
                                                    bindWith:self cvsCommandTimeout with:command)) ifTrue:[
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1086
                                done := false
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1087
                            ] ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1088
                                ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1089
                                p terminate.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1090
                                ok := false.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1091
                                errorString := 'CVS command timeout'.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1092
                            ]
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1093
                        ] ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1094
                            ok ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1095
                                errorString := errOut contents.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1096
                            ].
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1097
                        ]
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1098
                    ].
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1099
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1100
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1101
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1102
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1103
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  1104
        self breakPoint:#cg.
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1105
        self breakPoint:#jv.
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1106
        SourceCodeManagerError isHandled ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1107
            SourceCodeManagerError 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1108
                raiseRequestErrorString:(errorString ? 'CVS Error').
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1109
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1110
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1111
    ^ rslt
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1112
1508
06d441988888 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1113
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
06d441988888 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1114
    "Created: / 20-05-1998 / 16:06:34 / cg"
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1115
    "Modified: / 10-10-2011 / 14:47:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
  1116
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
2701
9f53f037ec00 class definition
Claus Gittinger <cg@exept.de>
parents: 2697
diff changeset
  1117
    "Modified: / 08-01-2012 / 19:49:04 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1118
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1120
getCVSROOTForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1121
    "internal: used when accessing a source repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1122
     Return the CVSROOT which provides the sources for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1123
     If no specific root was defined for that module, return the value of
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1124
     the global (fallBack) CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1125
     Nil is returned if no repository is available." 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1126
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1127
    CVSModuleRoots isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1128
    aModuleName isNil ifTrue:[^ CVSRoot].
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  1129
    ^ CVSModuleRoots at:aModuleName ifAbsent:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1130
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1131
    "Created: / 19.9.1997 / 06:18:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1132
    "Modified: / 20.5.1998 / 16:30:12 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1133
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1134
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1135
getCVSROOTsPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1136
    "return a dictionary, which associates CVSRoots to modules" 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1137
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1138
    ^ CVSModuleRoots ? #()
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1139
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1140
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1141
import:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1142
    "import the existing tree in tempdir as repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1143
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1144
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1145
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1146
    cmd := 'import -m "checkin from stx browser" . initialV initialR'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1147
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1148
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1149
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1150
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1151
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1152
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1153
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1154
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1155
      |f d|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1156
      f := 'stefan/dummy/fasel'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1157
      d := '/tmp/tt' asFilename construct:f.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1158
      d directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1159
      d writeStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1160
      self import:'stefan' in:'/tmp/tt/stefan' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1161
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1162
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1163
    "Created: / 23.7.1999 / 19:19:34 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1164
    "Modified: / 26.7.1999 / 17:46:29 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1165
    "Modified: / 18.1.2000 / 20:21:32 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1166
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1167
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1168
readRevisionLogEntryFromStream:inStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1169
    "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
  1170
     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
  1171
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1172
     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
  1173
     filled with:
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1174
              #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
  1175
              #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
  1176
              #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
  1177
              #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
  1178
              #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
  1179
              #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
  1180
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1181
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1182
    |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
  1183
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1184
    atEnd := false.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1185
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1186
    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1187
    [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
  1188
        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
  1189
                    revLine1 := nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1190
                   ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1191
                    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1192
                  ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1193
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1194
    revLine2 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1195
    (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
  1196
        record := IdentityDictionary new.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1197
        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
  1198
        "/ 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
  1199
        (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
  1200
            |subEntry|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1201
            subEntry := info withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1202
            #('date:'   #date
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1203
              'author:' #author 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1204
              'state:'  #state 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1205
              'lines:'  #numberOfChangedLines
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1206
             ) pairWiseDo:[:word :key |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1207
                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
  1208
                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
  1209
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1210
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1211
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1212
        "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
  1213
        (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
  1214
            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
  1215
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1216
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1217
        s := nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1218
        line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1219
        [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
  1220
            (line startsWith:'==========') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1221
                atEnd := true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1222
            ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1223
                (line withoutSpaces = '.') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1224
                    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
  1225
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1226
                s isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1227
                    s := line
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1228
                ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1229
                    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
  1230
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1231
                line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1232
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1233
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1234
        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
  1235
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1236
    ^record.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1237
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1238
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1239
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1240
releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1241
    "cleanup; release tree towards cvs and remove the temporary tree"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1242
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1243
    |cmd redirect|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1244
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1245
    outputFilename isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1246
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1247
            redirect := 'NUL'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1248
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1249
            redirect := '/dev/null'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1250
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1251
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1252
        redirect := outputFilename name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1253
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1254
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1255
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1256
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1257
    "/
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
  1258
    cmd := 'release > ' , redirect.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1259
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1260
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1261
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1262
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1263
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1264
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1265
"/        'CVSMGR: failed to release: ' errorPrint. cmd errorPrintNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1266
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1267
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1268
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1269
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1270
    "Modified: / 23.4.1996 / 14:29:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1271
    "Created: / 19.9.1997 / 06:28:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1272
    "Modified: / 20.5.1998 / 16:44:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1273
    "Modified: / 3.9.1999 / 14:51:29 / ps"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1274
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1275
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1276
repositoryTopDirectoryFromCVSRoot
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1277
    "return the top of the repository. This handles remote CVS connections
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1278
     as well"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1279
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1280
    CVSRoot isNil ifTrue:[^ nil].
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1281
    ^ self repositoryTopDirectoryFromCVSRoot:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1282
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1283
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1284
     CVSSourceCodeManager repositoryTopDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1285
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1286
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1287
    "Modified: / 16-01-1998 / 17:33:31 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1288
    "Created: / 21-06-2006 / 12:06:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1289
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1290
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1291
repositoryTopDirectoryFromCVSRoot:aString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1292
    "return the top of the repository (without remote prefix)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1293
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1294
    |idx|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1295
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1296
    idx := aString indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1297
    idx <= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1298
        ^ aString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1299
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1300
    ^ aString copyFrom:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1301
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1302
    "
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1303
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:':pserver:stefan@ibm.exept.de:/archiv/cvs'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1304
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'exept:/files/CVS'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1305
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'/archiv/cvs'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1306
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1307
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1308
    "Modified: / 16-01-1998 / 17:32:03 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1309
    "Created: / 21-06-2006 / 12:05:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1310
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1311
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1312
revisionStringFromLog:log entry:entry forClass:aClass
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1313
    "given a log entry, extract a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1314
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1315
    |oldRev idx special|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1316
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1317
    oldRev := aClass revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1318
    special := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1319
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1320
    oldRev notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1321
        idx := oldRev lastIndexOf:$[.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1322
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1323
            idx := oldRev indexOf:$[ startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1324
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1325
                special := ' ' , (oldRev copyFrom:idx).
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
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1329
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1330
    ^ '$Header: ' , (log at:#container) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1331
      ' ' , (entry at:#revision) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1332
      ' ' , (entry at:#date) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1333
      ' ' , (entry at:#author) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1334
      ' ' , (entry at:#state) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1335
      ' $' ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1336
      special
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1337
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1338
    "Created: 16.9.1996 / 20:24:14 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1339
    "Modified: 3.3.1997 / 22:31:51 / cg"
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
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1343
    "update a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1344
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1345
    |idx leftPart rightPart vsnString newVsn|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1346
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1347
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1348
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1349
    "/ search for ,v
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1350
    idx := originalVersionString indexOfSubCollection:'.st,v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1351
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1352
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1353
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1354
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1355
    idx := rightPart indexOfSeparator.
1484
0ea77138c0c5 fix revision string
Claus Gittinger <cg@exept.de>
parents: 1482
diff changeset
  1356
"/    idx == 0 ifTrue:[^ nil].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1357
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1358
    vsnString := rightPart copyTo:idx - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1359
    rightPart := rightPart copyFrom:idx + 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1360
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1361
    newRevision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1362
        (vsnString endsWith:'m') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1363
             "/ alread a modified class
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1364
"/            ('already modified: ' , vsnString) printNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1365
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1366
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1367
        newVsn := vsnString , 'm'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1368
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1369
        newVsn := newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1370
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1371
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1372
    ^ leftPart , ' ' , newVsn , ' ' , rightPart
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1373
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1374
    "Created: / 07-12-1995 / 20:23:38 / cg"
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1375
    "Modified: / 20-11-2006 / 22:22:09 / cg"
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1376
!
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1377
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1378
use_rlog
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1379
    ^ true "/ OperatingSystem isMSWINDOWSlike not
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1380
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1381
    "Modified: / 04-07-2006 / 18:05:43 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1382
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1383
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1384
!CVSSourceCodeManager class methodsFor:'queries'!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1385
2449
vrany
parents: 2403
diff changeset
  1386
isResponsibleForPackage:aString
vrany
parents: 2403
diff changeset
  1387
vrany
parents: 2403
diff changeset
  1388
    | id |
vrany
parents: 2403
diff changeset
  1389
vrany
parents: 2403
diff changeset
  1390
    "JV@2011-07-09: The real check is too slow. Cache needed here"
vrany
parents: 2403
diff changeset
  1391
    ^true.
vrany
parents: 2403
diff changeset
  1392
vrany
parents: 2403
diff changeset
  1393
"/    id := aString asPackageId. 
vrany
parents: 2403
diff changeset
  1394
"/    ^self checkForExistingModule: id module directory: id directory.
vrany
parents: 2403
diff changeset
  1395
vrany
parents: 2403
diff changeset
  1396
    "Created: / 09-07-2011 / 14:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2403
diff changeset
  1397
!
vrany
parents: 2403
diff changeset
  1398
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1399
managerTypeName
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1400
    ^ 'CVS'
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1401
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1402
    "Created: / 16-08-2006 / 11:05:56 / cg"
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1403
!
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1404
2196
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1405
nameOfVersionMethodForExtensions
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1406
    ^ #'extensionsVersion_CVS'
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1407
!
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1408
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1409
nameOfVersionMethodInClasses
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1410
    ^ #'version_CVS'
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1411
!
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1412
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1413
settingsApplicationClass
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1414
    "link to my settings application (needed for the settings dialog"
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1415
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1416
    ^ CVSSourceCodeManagementSettingsAppl
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1417
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1418
    "Created: / 19-04-2011 / 12:43:29 / cg"
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1419
    "Modified: / 19-04-2011 / 13:52:42 / cg"
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1420
! !
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1421
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1422
!CVSSourceCodeManager class methodsFor:'saving'!
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1423
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1424
savePreferencesOn:aStream
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1425
    aStream nextPutLine:'CVSSourceCodeManager notNil ifTrue:['.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1426
    self repositoryInfoPerModule notEmptyOrNil ifTrue:[
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1427
        aStream nextPutLine:'    CVSSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1428
    ].
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1429
    CVSExecutable notNil ifTrue:[
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1430
        aStream nextPutLine:'    CVSSourceCodeManager cvsExecutable:' , CVSExecutable storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1431
    ].
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1432
    (Smalltalk at:#SourceCodeManager) == self ifTrue:[
1899
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1433
        aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: CVSSourceCodeManager.'.
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1434
        aStream nextPutLine:'    CVSSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1435
    ] ifFalse:[
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1436
        aStream nextPutLine:'    CVSSourceCodeManager repositoryName:' , self repositoryName storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1437
    ].
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1438
    aStream nextPutLine:'].'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1439
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1440
    "Created: / 09-11-2006 / 15:09:25 / cg"
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1441
    "Modified: / 22-12-2011 / 00:47:28 / cg"
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1442
! !
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1443
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1444
!CVSSourceCodeManager class methodsFor:'source code access'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1445
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1446
checkin:containerFilename text:someText directory:packageDir module:moduleDir logMessage:logMessage force:force
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1447
    "enter some (source) code (which is someText)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1448
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1449
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1450
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1451
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1452
    |tempdir cmd checkoutName logMsg revision logTmp 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1453
     cmdOut whatHappened s  idx changeLog changesAsLogged l 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1454
     newRevision  msg answer didMerge
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1455
     modulePath time 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1456
     editor checkInRepaired didAccept emphasizedText repairedText out 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1457
     emSep comment|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1458
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1459
    revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1460
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1461
    logMsg := logMessage.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1462
    (logMsg isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1463
        logMsg := 'checkin from browser'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1464
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1465
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1466
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1467
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1468
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1469
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1470
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1471
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1472
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1473
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1474
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1475
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1476
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1477
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1478
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1479
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1480
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  1481
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  1482
        ('no tempDir - cannot checkin ' , containerFilename) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  1483
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  1484
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1485
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1486
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1487
    "/ next, create CVS/Entries and CVS/Repository with version information of current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1488
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1489
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1490
    checkoutName :=  modulePath , '/' , containerFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1491
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1492
    revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1493
        "/ a new file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1494
        ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1495
            createContainerForText:someText inModule:moduleDir package:packageDir container:containerFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1496
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1497
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1498
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1499
    "/ correct our current time, so that converting it will give us UTC
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1500
    "/
1507
883bdacd2617 use #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 1502
diff changeset
  1501
    time := Timestamp now asUtcTimestamp subtractSeconds:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1502
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1503
    self createEntryFor:checkoutName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1504
         module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1505
         in:(tempdir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1506
         revision:revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1507
         date:(self cvsTimeString:time)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1508
         special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1509
         overwrite:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1510
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1511
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1512
    "/ copy-over our current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1513
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1514
    Stream errorSignal handle:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1515
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1516
        'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1517
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1518
    ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1519
        s := (tempdir construct:checkoutName) writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1520
        s nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1521
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1522
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1523
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1524
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1525
    "/ synchronize i.e. merge in any changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1526
    "/
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  1527
    self activityNotification:'merging ' , containerFilename , ' with repository version...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1528
2010
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1529
    cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1530
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1531
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1532
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1533
        inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1534
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1535
        force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1536
            tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1537
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1538
            'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1539
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1540
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1541
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1542
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1543
        "/ check what happened - the contents of the cmdOut file may be:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1544
        "/   empty   -> nothing changed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1545
        "/   M xxx   -> merged-in changes from other users
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1546
        "/   C xxx   -> a conflict occured and the differences have been merged into the source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1547
        "/              needs special action
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1548
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1549
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1550
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1551
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1552
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1553
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1554
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1555
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1556
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1557
        "/ no change
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1558
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1559
"/        Transcript showCR:'no change in ' , containerFilename , ' (repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1560
        force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1561
            self information:'nothing changed in ' , containerFilename , ' (repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1562
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1563
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1564
        ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1565
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1566
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1567
    Verbose == true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1568
        ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1569
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1570
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1571
    force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1572
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1573
            changeLog := self revisionLogOfContainer:containerFilename directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1574
        ] ifFalse:[
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  1575
            changeLog := self revisionLogOfContainer:containerFilename module:moduleDir directory:packageDir fromRevision:(self revisionAfter:revision) toRevision:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1576
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1577
        changeLog notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1578
            s := WriteStream on:String new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1579
            self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1580
            changesAsLogged := s contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1581
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1582
            "/ mhmh - that should not happen
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1583
            changesAsLogged := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1584
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1585
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1586
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1587
    didMerge := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1588
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1589
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1590
    "/ cvs above rel10 returns a multiline info ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1591
    "/ we have to extract the one line which states what happened.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1592
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1593
    whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1594
    whatHappened := whatHappened select:[:line |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1595
                        (line startsWith:'RCS file') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1596
                        and:[(line startsWith:'retrieving') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1597
                        and:[(line startsWith:'Merging') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1598
                        and:[line size > 0]]]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1599
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1600
    whatHappened := whatHappened asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1601
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1602
    (force or:[whatHappened startsWith:'M ']) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1603
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1604
        "/ merged in changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1605
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1606
        (force 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1607
        or:[changeLog isNil 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1608
        or:[(changeLog at:#revisions) isEmpty]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1609
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1610
            "/ pretty good - nothing has changed in the meanwhile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1611
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1612
            Transcript showCR:'checking in ' , containerFilename , ' ...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1613
        ] ifFalse:[
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1614
            | mySource mergedSource |
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1615
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1616
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1617
            "/ someone else has changed things in the meanwhile, but there is no conflict
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1618
            "/ and version have been merged.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1619
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1620
            didMerge := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1621
            changesAsLogged := changesAsLogged asCollectionOfLines.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1622
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1623
            s := WriteStream on:String new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1624
            s nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1625
            mySource := s contents asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1626
            mergedSource := (tempdir construct:checkoutName) readStream contents asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1627
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1628
            mySource = mergedSource ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1629
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1630
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1631
I have merged your version with the newest repository version, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1632
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1633
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1634
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1635
                self checkinTroubleDialog:'Merging versions'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1636
                               message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1637
                               log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1638
                               abortable:false 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1639
                               option:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1640
                didMerge := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1641
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1642
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1643
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1644
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1645
into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1646
into a new common revision which may be different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1647
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
  1648
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1649
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1650
most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1651
change methods as required and check in again. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1652
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1653
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1654
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1655
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1656
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1657
                answer := self checkinTroubleDialog:'Merging versions'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1658
                               message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1659
                               log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1660
                               abortable:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1661
                               option:'Stop - see first'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1662
                answer ~~ true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1663
                    answer == #option ifTrue:[
1991
ada602745eca use new DiffCodeView
Claus Gittinger <cg@exept.de>
parents: 1990
diff changeset
  1664
                        DiffCodeView
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1665
                            openOn:mySource
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1666
                            label:'current version'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1667
                            and:mergedSource
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1668
                            label:'merged version'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1669
                            
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1670
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1671
                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1672
                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1673
                    ^ false.
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
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1678
"/                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1679
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1680
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1681
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1682
"/into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1683
"/into a new common revision which is different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1684
"/Although convenient, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1685
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1686
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1687
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1688
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1689
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1690
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1691
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1692
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1693
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1694
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1695
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1696
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1697
            Transcript showCR:'checking in ' , containerFilename , ' (merged other changes) ...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1698
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1699
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1700
        (whatHappened startsWith:'C ') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1701
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1702
            "/ conflict; someone else checked in something in the meanwhile,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1703
            "/ and there is a conflict between this version and the checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1704
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1705
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1706
            changesAsLogged := changesAsLogged asCollectionOfLines.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1707
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1708
            msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1709
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1710
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1711
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1712
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1713
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1714
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1715
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1716
            answer := self checkinTroubleDialog:'Version conflict'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1717
                 message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1718
                 log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1719
                 abortable:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1720
                 option:'show conflicts'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1721
                 option2:'resolve conflicts'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1722
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1723
            answer == #option ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1724
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1725
                "/ show conflicts in a 3-way DiffTextView ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1726
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1727
                Diff3TextView
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1728
                    openOnMergedText:(tempdir construct:checkoutName) readStream contents 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1729
                    label:'your version (checkin attempt)' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1730
                    label:'original (base version)' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1731
                    label:'newest repository version'. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1732
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1733
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1734
            checkInRepaired := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1735
            answer == #option2 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1736
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1737
                "/ allow checkin of repair version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1738
                "/ this is error prone ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1739
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1740
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1741
                "/ show merged version in an editor ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1742
                "/ ... accept will check it in.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1743
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1744
                emphasizedText := (tempdir construct:checkoutName) readStream contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1745
                emSep := (Array with:(#color->Color black)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1746
                             with:(#backgroundColor->Color green)).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1747
                emphasizedText := Diff3TextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1748
                            emphasizeMergedDiff3Text:emphasizedText 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1749
                            emphasize1:(Array with:(#color->Color white)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1750
                                              with:(#backgroundColor->Color blue))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1751
                            emphasize2:(Array with:(#color->Color white)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1752
                                              with:(#backgroundColor->Color red))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1753
                            emphasizeSep:emSep.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1754
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1755
                comment := 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1756
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1757
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1758
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1759
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1760
"/ Each such conflict is surrounded by green text (like this paragraph).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1761
"/ 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1762
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1763
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1764
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1765
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1766
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1767
                comment := (Text string:comment emphasis:emSep) asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1768
                emphasizedText := comment , emphasizedText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1769
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1770
                didAccept := false. checkInRepaired := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1771
                [didAccept not and:[checkInRepaired]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1772
                    editor := RCSConflictEditTextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1773
                                setupWith:emphasizedText
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1774
                                title:'Resolve conflicts in ' , containerFilename , ', then accept & close to checkin'.    
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1775
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1776
                    editor acceptAction:[:dummy |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1777
                        repairedText := editor list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1778
                        didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1779
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1780
                    didAccept := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1781
                    editor topView openModal.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1782
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1783
                    didAccept ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1784
                        (Dialog confirm:'You did not accept the new text. Edit again ?')
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1785
                        ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1786
                            checkInRepaired := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1787
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1788
                    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1789
                        "/ check if all green-stuff (separators) have been removed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1790
                        (repairedText findFirst:[:line | line notNil and:[line notEmpty and:[(line emphasisAt:1) = emSep]]]) ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1791
                            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
  1792
                            didAccept := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1793
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1794
                    ].
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
                checkInRepaired ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1799
                    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1800
                        out := (tempdir construct:checkoutName) writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1801
                        out nextPutAll:(repairedText asString string).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1802
                        didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1803
                        out close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1804
                    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1805
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1806
                        checkInRepaired := false.
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
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1810
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1811
            checkInRepaired ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1812
                Transcript showCR:'checking in ' , containerFilename , ' (manually repaired version) ...'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1813
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1814
                'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1815
                Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1816
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1817
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1818
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1819
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1820
            (whatHappened startsWith:'U ') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1821
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1822
                "/ nothing changed here, but the repository already contains
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1823
                "/ a newer version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1824
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1825
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1826
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1827
                self information:'nothing changed in your ''' , containerFilename , ''';
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1828
but repository already contains a newer version (repository unchanged).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1829
                ^ true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1830
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1831
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1832
                "/ unexpected
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1833
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1834
                self warn:'unexpected message from CVS:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1835
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1836
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1837
No checkin performed.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1838
                Transcript showCR:'*** cannot checkin ' , containerFilename , ' (unexpected CVS response; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1839
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1840
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1841
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1842
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1843
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1844
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1845
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1846
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1847
    "/ now check it in again
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1848
    "/
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  1849
    self activityNotification:'saving ' , containerFilename , ' in repository...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1850
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1851
    logMsg := logMsg replChar:$"  withString:'\"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1852
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1853
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1854
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1855
        logTmp := Filename newTemporaryIn:tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1856
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1857
        s nextPutAll:logMsg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1858
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1859
2010
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1860
        cmd := 'commit -F "%1" %2 %3 > "%4"'
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1861
                bindWith:logTmp baseName
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1862
                with:CVSCommitOptions
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1863
                with:checkoutName
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1864
                with:cmdOut name.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1865
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1866
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1867
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1868
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1869
        "/
2010
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1870
        cmd := 'commit -m "%1" %2 %3 > "%4" 2>&1'
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1871
                bindWith:logMsg
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1872
                with:CVSCommitOptions
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1873
                with:checkoutName
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  1874
                with:cmdOut name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1875
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1876
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1877
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1878
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1879
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1880
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1881
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1882
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1883
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1884
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1885
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1886
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1887
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1888
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1889
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1890
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1891
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1892
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1893
       ('CVSSourceCodeManager [error]: cvs: ' , whatHappened) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1894
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1895
        logTmp notNil ifTrue:[logTmp remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1896
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1897
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1898
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1899
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1900
    logTmp notNil ifTrue:[logTmp remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1901
    (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1902
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1903
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1904
        whatHappened := nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1905
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1906
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1907
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1908
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1909
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1910
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1911
    "/ fetch the new revision nr as found in the commit commands output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1912
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1913
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1914
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1915
        'CVSSourceCodeManager [error]: unexpected empty checkin command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1916
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1917
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1918
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1919
        idx == 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1920
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1921
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1922
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1923
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1924
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1925
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1926
    ^ true
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  1927
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  1928
    "Modified: / 12-11-2010 / 11:04:10 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1929
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1930
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1931
checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMessage force:forceArg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1932
    "enter a classes source code (which has been already filed out into sourceFileName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1933
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1934
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1935
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1936
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1937
    |tempdir cmd checkoutName logMsg revision newestRevision logTmp 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1938
     cmdOut whatHappened s entry idx changeLog changesAsLogged l 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1939
     newRevision newString binRevision className msg answer didMerge
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1940
     modulePath time 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1941
     editor checkInRepaired checkInNew didAccept emphasizedText repairedText out 
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  1942
     emSep comment force newVersionString conflictResolvedManually|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1943
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1944
    force := forceArg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1945
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1946
    className := cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1947
    cls isPrivate ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  1948
        self reportError:'refuse to check in private classes.'.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  1949
        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1950
    ].
2540
d62a6c2c7d02 changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2511
diff changeset
  1951
    revision := "cls revision" cls revisionOfManager:self.        
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  1952
    (revision notNil and:[revision endsWith:$m]) 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1953
    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1954
        "/ this class has already been checked in with a merge,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1955
        "/ but not reloaded from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1956
        "/ must use the original revision string.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1957
        revision := revision copyWithoutLast:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1958
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1959
    (binRevision := cls binaryRevision) notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1960
        revision ~= binRevision ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1961
            ('CVSSourceCodeManager [info]: class ' , className , ' is based upon ' , binRevision , ' but has revision ' , (revision ? '?')) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1962
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1963
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1964
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1965
    revision isNil ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1966
        revision := newestRevision := self newestRevisionOf:cls.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1967
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1968
            force ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1969
                revision := newestRevision := self newestRevisionInFile:classFileName directory:packageDir module:moduleDir.
1906
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  1970
                revision isNil ifTrue:[
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  1971
                    revision := '1.0'   "/ initial checkin
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  1972
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1973
            ] ifFalse:[
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1974
                revision := '1.0'   "/ initial checkin
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1975
            ]
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1976
        ] ifFalse:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1977
            revision == #deleted ifTrue:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1978
                revision := '0'     "/ to force cvs-adding, which resurrects the file from the Attic
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1979
            ].
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1980
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1981
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1982
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1983
    logMessage isNil ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1984
        logMsg := ''.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1985
    ] ifFalse:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1986
        logMsg := logMessage asSingleByteStringIfPossible.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1987
        logMsg bitsPerCharacter ~~ 8 ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  1988
            self reportError:'cvs cannot handle unicode in logMessage'.
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1989
            ^ false.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  1990
        ].    
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1991
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1992
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1993
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1994
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1995
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1996
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1997
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1998
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1999
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2000
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2001
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2002
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2003
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2004
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2005
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2006
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2007
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2008
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2009
        ('no tempDir - cannot checkin ' , className) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2010
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2011
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2012
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2013
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2014
    "/ next, create CVS/Entries and CVS/Repository with version information of current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2015
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2016
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2017
    checkoutName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2018
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2019
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2020
    "/ correct our current time, so that converting it will give us UTC
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2021
    "/
1507
883bdacd2617 use #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 1502
diff changeset
  2022
    time := Timestamp now asUtcTimestamp subtractSeconds:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2023
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2024
    self createEntryFor:checkoutName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2025
         module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2026
         in:(tempdir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2027
         revision:revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2028
         date:(self cvsTimeString:time)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2029
         special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2030
         overwrite:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2031
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2032
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2033
    "/ copy-over our current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2034
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2035
    Error handle:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2036
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2037
        self reportError:'cannot copy-over filedOut class source'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2038
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2039
    ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2040
        sourceFileName asFilename copyTo:(tempdir construct:checkoutName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2041
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2042
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2043
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2044
    "/ synchronize i.e. merge in any changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2045
    "/
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  2046
    self activityNotification:'merging ' , cls name , ' with repository version...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2047
2010
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  2048
    cmd := 'update %1 %2 >"%3"'
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  2049
        bindWith:CVSUpdateOptions
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  2050
        with:classFileName
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  2051
        with:cmdOut name.
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
  2052
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2053
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2054
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2055
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2056
        inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2057
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2058
        force ifFalse:[
1736
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
  2059
            cmdOut remove.
2c44d15f1a0f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1733
diff changeset
  2060
1813
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2061
            (self checkForExistingContainer:classFileName inModule:moduleDir directory:packageDir) ifFalse:[
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2062
                "/ no container
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2063
                "/ someone fiddled around with repository ?
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2064
                (cls binaryRevision notNil) ifTrue:[
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2065
                    (Dialog confirm:('Someone seems to have removed the source container for ',cls name,'\\Force new checkin ?') withCRs)
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2066
                    ifTrue:[
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2067
                        tempdir recursiveRemove.
1813
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2068
                        cls setBinaryRevision:nil.
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2069
                        ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMsg force:force.
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2070
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2071
                ].
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  2072
                (Dialog confirm:('There seems to be no source container for "%1"\(Either the source container was removed, or your per-module repository setting is wrong).\\Proceed?' bindWith:cls name allBold) withCRs)
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2073
                ifFalse:[
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2074
                    tempdir recursiveRemove.
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2075
                    ^ false
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2076
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2077
            ].
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2078
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2079
            "/ is the version correct ?
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2080
            newestRevision isNil ifTrue:[
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2081
                newestRevision := self newestRevisionOf:cls.
1813
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2082
                newestRevision isNil ifTrue:[
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2083
                    (Dialog confirm:('The source container for ',cls name allBold,' seems corrupted. Proceed?' withCRs)) ifFalse:[
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2084
                        tempdir recursiveRemove.
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2085
                        ^ false
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2086
                    ].
1813
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2087
                ].
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2088
            ].
2483
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2089
"/            revision > newestRevision ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2090
"/                true "/ (Dialog confirm:('The version-info of ',cls name allBold,' is wrong \(The class version (',revision allBold,') is newer than the newest version in the repository (',newestRevision allBold,').\\Patch the version and retry checkin ?') withCRs)
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2091
"/                ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2092
"/                    "/ newVersionString := self updatedRevisionStringOf:cls forRevision:newestRevision with:cls revisionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2093
"/                    "/ self updateVersionMethodOf:cls for:newVersionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2094
"/                    ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMsg force:force.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2095
"/                ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2096
"/            ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2097
"/
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2098
"/            self reportError:('cannot merge current source with repository version (failed to execute: ',cmd,')').
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2099
"/            ^ false.
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2100
            "/ if we arrive here, proceed as if merged
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2101
            whatHappened := 'M initial'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2102
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2103
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2104
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2105
        "/ check what happened - the contents of the cmdOut file may be:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2106
        "/   empty   -> nothing changed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2107
        "/   M xxx   -> merged-in changes from other users
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2108
        "/   C xxx   -> a conflict occured and the differences have been merged into the source
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2109
        "/              needs special action
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2110
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2111
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2112
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2113
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2114
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2115
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2116
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  2117
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2118
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2119
        "/ no change
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2120
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2121
"/        Transcript showCR:'no change in ' , className , ' (repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2122
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2123
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2124
        force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2125
"/            (ChangeSet current includesChangeForClass:cls) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2126
"/                (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
  2127
"/                    ChangeSet current condenseChangesForClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2128
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2129
"/            ] ifFalse:[
1425
c02c03705574 be less chatty.
Claus Gittinger <cg@exept.de>
parents: 1424
diff changeset
  2130
"/                self information:('Nothing changed in %1 (repository unchanged)' bindWith:className).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2131
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2132
            self postCheckInClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2133
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2134
            changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2135
            (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2136
                'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  2137
                self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2138
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2139
                entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2140
                newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  2141
                self updateVersionMethodOf:cls for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2142
                cls revision ~= newRevision ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2143
                    'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
2540
d62a6c2c7d02 changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2511
diff changeset
  2144
                ] ifFalse:[
d62a6c2c7d02 changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2511
diff changeset
  2145
                    ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2146
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2147
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2148
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2149
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2150
        ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2151
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2152
    Verbose == true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2153
        ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2154
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2155
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2156
    force ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2157
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2158
            changeLog := self revisionLogOf:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2159
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2160
            changeLog := self revisionLogOf:cls fromRevision:(self revisionAfter:revision) toRevision:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2161
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2162
        changeLog notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2163
            s := WriteStream on:String new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2164
            self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2165
            changesAsLogged := s contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2166
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2167
            "/ mhmh - that should not happen
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2168
            changesAsLogged := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2169
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2170
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2171
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2172
    didMerge := false.
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2173
    conflictResolvedManually := checkInRepaired := checkInNew := false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2174
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2175
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2176
    "/ cvs above rel10 returns a multiline info ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2177
    "/ we have to extract the one line which states what happened.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2178
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2179
    whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2180
    whatHappened := whatHappened select:[:line |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2181
                        (line startsWith:'RCS file') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2182
                        and:[(line startsWith:'retrieving') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2183
                        and:[(line startsWith:'Merging') not
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2184
                        and:[line size > 0]]]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2185
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2186
    whatHappened := whatHappened asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2187
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2188
    (force or:[(whatHappened startsWith:'M ') or:[whatHappened startsWith:'A ']]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2189
        "/
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2190
        "/ merged in changes / resurrected
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2191
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2192
        (force 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2193
        or:[changeLog isNil 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2194
        or:[(changeLog at:#revisions) isEmpty]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2195
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2196
            "/ pretty good - nothing has changed in the meanwhile
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2197
            "/
1884
f22617540244 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1880
diff changeset
  2198
            Transcript showCR:('checking in %1 (%2)...' bindWith:className with:modulePath).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2199
        ] ifFalse:[
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  2200
            |mySource mergedSource |
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  2201
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2202
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2203
            "/ someone else has changed things in the meanwhile, but there is no conflict
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2204
            "/ and version have been merged.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2205
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2206
            didMerge := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2207
            changesAsLogged := changesAsLogged asCollectionOfLines.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2208
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2209
            s := WriteStream on:String new.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  2210
            self fileOutSourceCodeOf: cls on:s.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2211
            mySource := s contents asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2212
            mergedSource := (tempdir construct:checkoutName) readStream contents asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2213
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2214
            mySource = mergedSource ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2215
                msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2216
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2217
I have merged your version with the newest repository version, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2218
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2219
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2220
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2221
                self checkinTroubleDialog:'Merging versions'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2222
                               message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2223
                               log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2224
                               abortable:false 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2225
                               option:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2226
                didMerge := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2227
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2228
                msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2229
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2230
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2231
into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2232
into a new common revision which may be different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2233
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
  2234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2235
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2236
most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2237
change methods as required and check in again. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2238
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2239
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2240
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2241
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2242
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2243
                answer := self checkinTroubleDialog:'Merging versions'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2244
                               message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2245
                               log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2246
                               abortable:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2247
                               option:'Stop - see first'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2248
                               option2:'Do NOT Merge - Force my Code'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2249
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2250
                answer == #option2 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2251
                    (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
  2252
                    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2253
                        s := (tempdir construct:checkoutName) writeStream.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  2254
                        self fileOutSourceCodeOf: cls on:s.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2255
                        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2256
                        answer := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2257
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2258
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2259
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2260
                answer ~~ true ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2261
                    answer == #option ifTrue:[
1991
ada602745eca use new DiffCodeView
Claus Gittinger <cg@exept.de>
parents: 1990
diff changeset
  2262
                        DiffCodeView
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2263
                            openOn:mySource
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2264
                            label:'current version'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2265
                            and:mergedSource
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2266
                            label:'merged version'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2267
                            
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2268
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2269
                    tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2270
                    self reportError:'checkin aborted - (no merge; repository unchanged)'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2271
                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2272
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2273
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2274
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2275
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2276
"/                msg := 'The source of ' , className , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2277
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2278
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2279
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2280
"/into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2281
"/into a new common revision which is different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2282
"/Although convenient, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2283
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2284
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2285
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2286
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2287
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2288
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2289
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2290
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2291
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2292
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2293
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2294
"/                ].
1884
f22617540244 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1880
diff changeset
  2295
            Transcript showCR:('checking in %1 (%2) (merge)...' bindWith:className with:modulePath).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2296
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2297
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2298
        (whatHappened startsWith:'C ') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2299
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2300
            "/ conflict; someone else checked in something in the meanwhile,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2301
            "/ and there is a conflict between this version and the checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2302
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2303
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2304
            changesAsLogged := changesAsLogged asCollectionOfLines.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2305
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2306
            msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2307
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2308
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2309
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2310
You should fix things by comparing your class with the most recent repository version
2014
9e548ccb1c5e Fix typo in user info text
Stefan Vogel <sv@exept.de>
parents: 2011
diff changeset
  2311
and change your methods avoiding conflicts. Then checkin again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2312
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2313
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2314
            answer := self checkinTroubleDialog:'Version conflict'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2315
                 message:msg 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2316
                 log:changesAsLogged
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2317
                 abortable:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2318
                 option:'Show conflicts'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2319
                 option2:'Resolve conflicts'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2320
                 option3:'Do NOT Merge - Force my Code'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2321
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2322
            answer == #option ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2323
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2324
                "/ show conflicts in a 3-way DiffTextView ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2325
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2326
                Diff3TextView
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2327
                    openOnMergedText:(tempdir construct:checkoutName) readStream contents 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2328
                    label:'your version (checkin attempt)' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2329
                    label:'original (base version)' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2330
                    label:'newest repository version'. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2331
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2332
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2333
            answer == #option2 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2334
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2335
                "/ allow checkin of repair version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2336
                "/ this is error prone ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2337
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2338
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2339
                "/ show merged version in an editor ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2340
                "/ ... accept will check it in.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2341
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2342
                emphasizedText := (tempdir construct:checkoutName) readStream contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2343
                emSep := (Array with:(#color->Color black)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2344
                             with:(#backgroundColor->Color green)).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2345
                emphasizedText := Diff3TextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2346
                            emphasizeMergedDiff3Text:emphasizedText 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2347
                            emphasize1:(Array with:(#color->Color white)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2348
                                              with:(#backgroundColor->Color blue))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2349
                            emphasize2:(Array with:(#color->Color white)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2350
                                              with:(#backgroundColor->Color red))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2351
                            emphasizeSep:emSep.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2352
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2353
                comment := 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2354
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2355
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2356
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2357
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2358
"/ Each such conflict is surrounded by green text (like this paragraph).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2359
"/ 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2360
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2361
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2362
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2363
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2364
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2365
                comment := (Text string:comment emphasis:emSep) asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2366
                emphasizedText := comment , emphasizedText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2367
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2368
                didAccept := false. checkInRepaired := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2369
                [didAccept not and:[checkInRepaired]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2370
                    editor := RCSConflictEditTextView 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2371
                                setupWith:emphasizedText
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2372
                                title:'Resolve conflicts in ' , className , ', then accept & close to checkin'.    
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2373
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2374
                    editor acceptAction:[:dummy |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2375
                        repairedText := editor list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2376
                        didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2377
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2378
                    didAccept := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2379
                    editor topView openModal.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2380
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2381
                    didAccept ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2382
                        (Dialog confirm:'You did not accept the new text. Edit again ?')
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2383
                        ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2384
                            checkInRepaired := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2385
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2386
                    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2387
                        "/ check if all green-stuff (separators) have been removed
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2388
                        (repairedText findFirst:[:line | line notNil and:[line notEmpty and:[(line emphasisAt:1) = emSep]]]) ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2389
                            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
  2390
                            didAccept := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2391
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2392
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2393
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2394
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2395
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2396
                checkInRepaired ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2397
                    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2398
                        out := (tempdir construct:checkoutName) writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2399
                        out nextPutAll:(repairedText asString string).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2400
                        didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2401
                        out close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2402
                    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2403
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2404
                        checkInRepaired := false.
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
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2408
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2409
            answer == #option3 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2410
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2411
                "/ force checkin of new version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2412
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2413
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2414
                "/ show merged version in an editor ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2415
                "/ ... accept will check it in.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2416
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2417
                [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2418
                    out := (tempdir construct:checkoutName) writeStream.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  2419
                    self fileOutSourceCodeOf: cls on:out.
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  2420
                    out close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2421
                    didAccept := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2422
                    checkInNew := checkInRepaired := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2423
                ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2424
                    self warn:'could not write file ' , (tempdir constructString:checkoutName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2425
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2426
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2427
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2428
            checkInRepaired ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2429
                checkInNew ifTrue:[
1884
f22617540244 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1880
diff changeset
  2430
                    Transcript showCR:('checking in %1 (%2) (force)...' bindWith:className with:modulePath).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2431
                ] ifFalse:[
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2432
                    conflictResolvedManually := true.    "/ checkInRepaired and:[checkInNew not].
1884
f22617540244 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1880
diff changeset
  2433
                    Transcript showCR:('checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2434
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2435
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2436
                Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2437
                tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2438
                self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2439
                ^ false.
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2440
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2441
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2442
            ((whatHappened startsWith:'U ') 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2443
            or:[ (whatHappened startsWith:'P ') ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2444
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2445
                "/ nothing changed here, but the repository already contains
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2446
                "/ a newer version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2447
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2448
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2449
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2450
                self information:'nothing changed in your ''' , className , ''';
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2451
but repository already contains a newer version (repository unchanged).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2452
                ^ true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2453
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2454
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2455
                "/ unexpected
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2456
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2457
                self warn:'unexpected message from CVS:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2458
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2459
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2460
No checkin performed.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2461
                tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2462
                self reportError:'*** cannot checkin ' , className , ' (unexpected CVS response; repository unchanged)'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2463
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2464
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2465
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2466
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2467
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2468
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2469
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2470
    "/ now check it in again
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2471
    "/
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  2472
    self activityNotification:'saving ' , cls name , ' in repository...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2473
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2474
    logMsg := logMsg replChar:$"  withString:'\"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2475
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2476
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2477
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2478
        logTmp := Filename newTemporaryIn:tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2479
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2480
        s nextPutAll:logMsg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2481
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2482
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2483
        cmd := 'commit -F "', logTmp baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2484
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2485
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2486
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2487
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2488
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2489
        cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"', cmdOut name, '"' , ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2490
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2491
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2492
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2493
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2494
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2495
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2496
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2497
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2498
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2499
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2500
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2501
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2502
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2503
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2504
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2505
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2506
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2507
        logTmp notNil ifTrue:[logTmp remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2508
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2509
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2510
        self reportError:'cannot checkin modified class source'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2511
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2512
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2513
    logTmp notNil ifTrue:[logTmp remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2514
    (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2515
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2516
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2517
        whatHappened := nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2518
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2519
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2520
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2521
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2522
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2523
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2524
    "/ fetch the new revision nr as found in the commit commands output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2525
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  2526
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2527
        'CVSSourceCodeManager [error]: unexpected empty checkin command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2528
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2529
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2530
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2531
        idx == 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2532
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2533
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2534
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2535
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2536
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2537
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2538
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2539
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2540
    "/ if there was no merge (i.e. the current version has been checked in unchanged):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2541
    "/   patch the classes revisionInfo (but keep binaryRevision unchanged) to the new revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2542
    "/   this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2543
    "/   the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2544
    "/   (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
  2545
    "/    correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2546
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2547
    "/ 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
  2548
    "/ other version):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2549
    "/    patch the classes revisionInfo (again, keep the binaryRevision) to the old revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2550
    "/    and add a 'm' (for merged).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2551
    "/    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
  2552
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2553
    newRevision notNil ifTrue:[
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2554
        (didMerge or:[conflictResolvedManually]) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2555
            self activityNotification:'fetch new revision number of ', cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2556
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2557
            changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2558
            (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2559
                force ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2560
                    changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2561
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2562
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2563
            (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2564
                'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  2565
                self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2566
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2567
                entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2568
                newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  2569
                self updateVersionMethodOf:cls for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2570
                cls revision ~= newRevision ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2571
                    'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2572
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2573
            ]
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2574
        ] ifTrue:[      
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2575
            "/ If the conflict was resolved manually, do NOT update the revision method 
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2576
            "/ (to get a new conflict in the next check-in)
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2577
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2578
            "/ If there was a merge, update the revision method adding an 'm'"
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2579
            didMerge ifTrue: [
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2580
                newString := self updatedRevisionStringOf:cls forRevision:nil with:cls revisionString.
2403
7290a8be819d changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2401
diff changeset
  2581
                newString notNil ifTrue:[ self updateVersionMethodOf:cls for:newString ].
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2582
            ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2583
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2584
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2585
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2586
    Class addChangeRecordForClassCheckIn:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2587
    self postCheckInClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2588
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2589
    conflictResolvedManually ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2590
        self information:'Now the repository contains a merge between your and the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2591
However, the class in your image does NOT contain the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2592
This will lead to more conflict-resolving whenever you check this class in again later,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2593
unless you load the newest (merged) version of the class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2594
2604
e0743b3ba275 message text only
Claus Gittinger <cg@exept.de>
parents: 2601
diff changeset
  2595
I recommend doing this as soon as possible via your browser''s checkout function.'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2596
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2597
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2598
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2599
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2600
     SourceCodeManager checkinClass:Array logMessage:'testing only'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2601
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2602
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2603
    "Created: / 11-09-1996 / 16:16:11 / cg"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2604
    "Modified: / 26-02-1998 / 17:34:16 / stefan"
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  2605
    "Modified: / 22-12-2011 / 00:42:10 / cg"
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2606
!
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2607
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2608
checkoutModule:aModule directory:aPackage andDo:aBlock
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2609
    "check out everything from a package into a temporary directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2610
     Then evaluate aBlock, passing the name of that temp-directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2611
     Afterwards, the tempDir is removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2612
     Return true, if OK, false if any error occurred."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2613
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2614
    |cvsRoot packageDir tempdir cmdOut cmd dirName rslt|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2615
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2616
    cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2617
    cvsRoot isNil ifTrue:[^ false ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2618
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2619
    aPackage notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2620
        dirName := aModule , '/' , aPackage.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2621
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2622
        dirName := aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2623
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2624
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  2625
    self activityNotification:'Checking out everything in ' , dirName , '...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2626
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2627
    tempdir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2628
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
  2629
    cmd := 'checkout ', dirName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2630
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2631
        "/ can redirect output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2632
        cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2633
        cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2634
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2635
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2636
        cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2637
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2638
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2639
    SourceCodeManagerError handle:[:ex |
2021
91dea20f6369 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2014
diff changeset
  2640
        self halt:'please check what is going on here'
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2641
    ] do:[
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2642
        rslt := self 
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2643
            executeCVSCommand:cmd 
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2644
            module:aModule
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2645
            inDirectory:tempdir name.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2646
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2647
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2648
    cmdOut notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2649
"/        listOfFiles := cmdOut contents.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2650
        cmdOut remove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2651
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2652
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2653
    packageDir := (tempdir construct:dirName).
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2654
    (packageDir exists and:[packageDir isDirectory]) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2655
        tempdir recursiveRemove.
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2656
        self reportError:(rslt ifTrue:['checkout failed (no dir)'] ifFalse:['failed to execute: ',cmd]).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2657
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2658
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2659
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2660
    "/ now, invoke the block ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2661
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2662
        aBlock value:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2663
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2664
        tempdir recursiveRemove.
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
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2668
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2669
    "Created: / 23-08-2006 / 14:07:05 / cg"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  2670
    "Modified: / 12-11-2010 / 11:09:40 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2671
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2672
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2673
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheItArg
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2674
    "extract a source file and return an open readStream on it,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2675
     or nil if the extract failed. If revision is nil or (#newest), take
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2676
     the latest; otherwise, a specific revisions source is extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2677
     The cls argument is currently ignored, but may be used in future versions,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2678
     to validate the correct container against the class.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2679
     To check out a file (i.e. not a classes file), leave it nil."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2680
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2681
    |cacheDir cacheSubDir cachedSourceFilename cachedFile cmd fullName revisionArg stream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2682
     checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2683
     classFileName cvsRoot tempFile revMsg cacheIt|
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2684
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2685
    cacheIt := cacheItArg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2686
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2687
    (DisabledModules notNil and:[DisabledModules includes:moduleDir]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2688
        Transcript showCR:'cvs access for module ' , moduleDir , ' has been disabled (due to previous failure)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2689
        Transcript showCR:'reenable using the launchers source&debugger dialog'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2690
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2691
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2692
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2693
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2694
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2695
    cvsRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2696
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2697
    "/ if not already existing, create a cache directory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2698
    "/ where we deposit sources.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2699
    "/ this is used as a cache for further requests, since
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2700
    "/ accessing the repository may be slow.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2701
    "/ (if cvs uses a remote connection via ppp, for example)
1917
4ba8f60b0d50 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1912
diff changeset
  2702
4ba8f60b0d50 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1912
diff changeset
  2703
    (cacheIt and:[revision ~~ #newest and:[revision notNil]]) ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2704
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2705
            'CVSSourceCodeManager [warning]: no source cache directory' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2706
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2707
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2708
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2709
    classFileName := fileName.
1862
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2710
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2711
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2712
    (classFileName endsWith:',v') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2713
        classFileName := classFileName copyWithoutLast:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2714
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2715
    (classFileName endsWith:'.st') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2716
        cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2717
            classFileName := classFileName copyWithoutLast:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2718
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2719
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2720
    fullName := moduleDir , '/' , packageDir , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2721
    cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2722
        fullName := fullName , '.st'.
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
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2726
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2727
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2728
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2729
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2730
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2731
    cacheDir notNil ifTrue:[
2230
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2732
        cacheSubDir := cacheDir / moduleDir / packageDir.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2733
        cachedFile := cacheSubDir / cachedSourceFilename.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2734
        cachedFile exists ifTrue:[
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2735
            ^ cachedFile readStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2736
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2737
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2738
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2739
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2740
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2741
    "/ 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
  2742
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2743
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2744
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2745
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout ' , classFileName) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2746
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2747
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2748
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2749
"/    tempdir := Filename newTemporaryIn:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2750
"/    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2751
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2752
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2753
"/    tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2754
"/    dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2755
"/    dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2756
"/    dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2757
"/    dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2758
"/    dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2759
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2760
"/        'CVSMGR: cannot create temporary directory' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2761
"/        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2762
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2763
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2764
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2765
    "/ check it out there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2766
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2767
    checkoutName :=  fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2768
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2769
    checkoutNameLocal := (moduleDir asFilename construct:packageDir) constructString:(fullName asFilename baseName).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2770
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2771
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2772
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2773
        revisionArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2774
        revMsg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2775
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2776
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2777
        revisionArg := ' -r ' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2778
        revMsg := ' (' , revision , ')'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2779
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2780
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  2781
    self activityNotification:'Checking out source ' , checkoutName , revMsg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2782
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2783
        "/ can redirect output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2784
        cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2785
        cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2786
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2787
        ].
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
  2788
        cmd := 'checkout' , revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2789
    ] 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
  2790
        cmd := 'checkout' , revisionArg , ' ', checkoutName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2791
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2792
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2793
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2794
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2795
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2796
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2797
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2798
        cmdOut notNil ifTrue:[cmdOut remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2799
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2800
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
1477
bea2ad3479eb no longer automatically disable a CVS module !
Claus Gittinger <cg@exept.de>
parents: 1465
diff changeset
  2801
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2802
"/        "/ see if there is CVS access at all ...
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2803
"/        (self checkForExistingModule:moduleDir) ifFalse:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2804
"/            "/ disable
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2805
"/            DisabledModules isNil ifTrue:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2806
"/                DisabledModules := Set new.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2807
"/            ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2808
"/            DisabledModules add:moduleDir.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2809
"/            ('CVSSourceCodeManager [warning]: disabled repository access for module ' , moduleDir) errorPrintCR.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2810
"/        ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2811
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2812
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2813
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2814
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2815
    cmdOut notNil ifTrue:[cmdOut remove].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2816
    fullTempName := tempdir construct:checkoutNameLocal.
1781
88b05e77dab1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1779
diff changeset
  2817
    (cacheSubDir isNil) ifTrue:[
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2818
        cacheIt := false
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2819
    ] ifFalse:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2820
        cacheSubDir recursiveMakeDirectory.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2821
        fullCachedName := cacheSubDir constructString:cachedSourceFilename.
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2822
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2823
    fullTempName exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2824
        ('CVSSourceCodeManager [error]: failed to checkout ', fullTempName pathName, ' (file does not exist after cvs co)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2825
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2826
        ^ nil
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
    (cacheIt 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2830
    and:[cachedFile notNil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2831
    and:[fullTempName exists]])
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2832
    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2833
        (OperatingSystem errorSignal catch:[
2206
9b14eca8d8ad changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2204
diff changeset
  2834
            fullTempName moveTo:fullCachedName.
9b14eca8d8ad changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2204
diff changeset
  2835
            self activityNotification:'Cached as ',fullCachedName asFilename baseName.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2836
        ]) ifTrue:[
2206
9b14eca8d8ad changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2204
diff changeset
  2837
            self activityNotification:'Not cached.'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2838
            ('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2839
            tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2840
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2841
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2842
        fullCachedName asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2843
            stream := fullCachedName asFilename readStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2844
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2845
    ] ifFalse:[
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  2846
        fileName = 'extensions.st' ifTrue:[
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  2847
            self activityNotification:'Not cached - please check your settings and/or the version method in the projectDefinition.'.
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  2848
        ] ifFalse:[
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  2849
            self activityNotification:'Not cached - please check your settings.'.
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  2850
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2851
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2852
            "/ cannot remove files which are still open ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2853
            "/ sigh - need a delete-on-close flag in FileStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2854
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2855
            tempFile := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2856
            fullTempName copyTo:tempFile.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2857
            stream := tempFile readStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2858
            stream notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2859
                stream removeOnClose:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2860
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2861
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2862
            stream := fullTempName readStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2863
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2864
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2865
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2866
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2867
    ^ stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2868
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2869
    "Created: / 04-11-1995 / 19:46:20 / cg"
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2870
    "Modified: / 20-08-1997 / 16:37:11 / stefan"
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  2871
    "Modified: / 07-09-2011 / 09:58:06 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2872
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2873
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2874
!CVSSourceCodeManager class methodsFor:'source code administration'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2875
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2876
checkForExistingContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2877
    "check for a container to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2878
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2879
    |fullName ret ret2 cvsRoot cmd tempDir outputStream errorStream|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2880
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2881
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2882
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2883
    RemoteCVS ifFalse:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  2884
        cvsRoot := self getCVSROOTForModule:moduleDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2885
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2886
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2887
            "/ with local CVS - simply check if that file exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2888
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2889
            (fullName endsWith:',v') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2890
                fullName := fullName , ',v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2891
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2892
            ^ (cvsRoot , '/' , fullName) asFilename exists.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2893
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2894
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2895
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2896
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2897
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2898
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2899
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2900
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2901
    (fullName endsWith:',v') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2902
        fullName := fullName copyWithoutLast:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2903
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2904
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  2905
    "/ 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
  2906
    "/ (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
  2907
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  2908
    "/ cmd := '-n rtag -l -F dummy '.
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  2909
    cmd := '-n rtag -F dummy '.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2910
    [  
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2911
        errorStream := '' writeStream.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2912
        outputStream := '' writeStream.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2913
        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2914
        ret := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2915
                    executeCVSCommand:cmd , fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2916
                    module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2917
                    "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2918
                    "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2919
                    "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2920
                    inDirectory:(tempDir pathName) 
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2921
                    log:false
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2922
                    outputTo:outputStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2923
                    errorTo:errorStream.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2924
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2925
        "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
  2926
         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
  2927
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2928
        "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
  2929
        "/ cg: read comment above.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2930
        ret2 := errorStream size == 0.
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2931
        ret2 ifFalse:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2932
            ret2 := (errorStream contents asCollectionOfLines 
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2933
                        reject:[:l | l isBlank or:[(l includesString:'WARNING:')] ]) size == 0 
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  2934
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2935
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2936
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2937
    ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2938
    ^ ret2
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2939
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2940
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2941
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2942
        checkForExistingContainer:'Integer.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2943
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2944
        directory:'libbasic' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2945
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2946
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2947
        checkForExistingContainer:'AboutBox.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2948
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2949
        directory:'libtool' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2950
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2951
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2952
    "Modified: / 23-07-1999 / 17:36:58 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2953
    "Created: / 13-09-2006 / 18:20:36 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2954
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2955
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2956
checkForExistingModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2957
    "check for a module to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2958
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2959
    |ret cvsRoot cmd tempDir isLocalCVSRoot |
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2960
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2961
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2962
        (RecentlyCheckedModulesAndPackages includes:moduleDir) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2963
            RecentlyCheckedModulesAndPackages remove:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2964
            RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2965
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2966
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2967
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2968
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2969
    self activityNotification:'checking for existing module ' , moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2970
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2971
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2972
    cvsRoot isNil ifTrue:[^ false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2973
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2974
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2975
        cvsRoot := cvsRoot copyFrom:(':local:'size+1).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2976
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2977
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2978
    ((RemoteCVS not or:[isLocalCVSRoot])
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2979
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2980
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2981
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2982
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2983
        ret := (cvsRoot , '/' , moduleDir) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2984
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2985
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2986
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2987
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2988
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2989
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2990
        cmd := '-n rtag -l dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2991
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2992
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2993
                        executeCVSCommand:cmd , moduleDir 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2994
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2995
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2996
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2997
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2998
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2999
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3000
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3001
            tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3002
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3003
    ].
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3004
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3005
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3006
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3007
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3008
    RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3009
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3010
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3011
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3012
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3013
     CVSSourceCodeManager checkForExistingModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3014
     CVSSourceCodeManager checkForExistingModule:'DPU'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3015
     CVSSourceCodeManager checkForExistingModule:'cg'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3016
     CVSSourceCodeManager checkForExistingModule:'aeg' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3017
     CVSSourceCodeManager checkForExistingModule:'foo'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3018
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3019
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  3020
    "Created: / 09-12-1995 / 19:13:37 / cg"
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  3021
    "Modified: / 23-07-1999 / 17:38:59 / stefan"
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3022
    "Modified: / 19-08-2011 / 10:38:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3023
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3024
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3025
checkForExistingModule:moduleDir directory:directory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3026
    "check for a package to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3027
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3028
    |ret cvsRoot cmd tempDir fullName isLocalCVSRoot|
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3029
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3030
    fullName := moduleDir , '/' , directory.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3031
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3032
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3033
        (RecentlyCheckedModulesAndPackages includes:fullName) ifTrue:[
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3034
            RecentlyCheckedModulesAndPackages remove:fullName.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3035
            RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3036
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3037
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3038
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3039
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3040
    self activityNotification:'checking for existing package ' , directory.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3041
1365
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3042
    cvsRoot := self getCVSROOTForModule:moduleDir.
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3043
    cvsRoot isNil ifTrue:[^ false].
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3044
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3045
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3046
        cvsRoot := cvsRoot copyFrom:(':local:'size+1).
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3047
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3048
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3049
    ((RemoteCVS not or:[isLocalCVSRoot]) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3050
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3051
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3052
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3053
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3054
        ret := (cvsRoot , '/' , fullName) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3055
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3056
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3057
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3058
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3059
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3060
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3061
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3062
        cmd := '-n rtag -l -F dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3063
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3064
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3065
                        executeCVSCommand:cmd, fullName 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3066
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3067
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3068
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3069
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3070
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3071
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3072
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3073
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3074
            tempDir recursiveRemove.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3075
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3076
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3077
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3078
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3079
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3080
    ].
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3081
    RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3082
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3083
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3084
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3085
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3086
     CVSSourceCodeManager checkForExistingModule:'stx' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3087
     CVSSourceCodeManager checkForExistingModule:'aeg' package:'libProgram'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3088
     CVSSourceCodeManager checkForExistingModule:'foo' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3089
     CVSSourceCodeManager checkForExistingModule:'foo' package:'bar'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3090
     CVSSourceCodeManager checkForExistingModule:'cg' package:'private'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3091
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3092
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3093
    "Modified: / 23-07-1999 / 17:39:21 / stefan"
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3094
    "Created: / 23-08-2006 / 14:03:03 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3095
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3096
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3097
createContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3098
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3099
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3100
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3101
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3102
     changeLog entry newString startIdx endIdx checkInDir logTmp s|
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
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3106
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3107
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3108
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3109
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3110
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3111
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3112
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3113
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3114
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3115
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3116
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3117
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3118
    self activityNotification:'checking for directory ' , checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3119
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3120
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3121
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3122
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3123
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3124
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3125
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3126
    "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3127
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3128
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3129
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3130
        aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3131
    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3132
        ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3133
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3134
        ^ false
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
    Class fileOutErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3138
        'CVSSourceCodeManager [error]: fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3139
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3140
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3141
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3142
    ] do:[
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3143
        self fileOutSourceCodeOf:aClass on:aStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3144
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3145
    aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3146
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3147
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3148
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3149
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3150
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3151
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3152
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3153
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3154
    "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3155
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3156
    self activityNotification:'adding ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3157
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3158
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3159
        checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3160
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3161
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3162
            checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3163
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3164
            self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3165
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3166
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3167
    cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3168
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3169
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3170
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3171
        inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3172
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3173
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3174
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3175
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3176
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3177
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3178
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3179
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3180
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3181
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3182
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3183
    self activityNotification:'committing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3184
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3185
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3186
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3187
        logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3188
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3189
        s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3190
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3191
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3192
        cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' > ', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3193
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3194
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3195
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3196
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3197
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3198
        cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3199
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3200
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3201
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3202
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3203
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3204
        inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3205
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3206
        cmdOut fileSize > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3207
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3208
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3209
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3210
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3211
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3212
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3213
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3214
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3215
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3216
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3217
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3218
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3219
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3220
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3221
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3222
    whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3223
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3224
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3225
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3226
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3227
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3228
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3229
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3230
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3231
    "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3232
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3233
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3234
        'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3235
        "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3236
        "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3237
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3238
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3239
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3240
        idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3241
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3242
            startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3243
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3244
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3245
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3246
                'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3247
                startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3248
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3249
                'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3250
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3251
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3252
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3253
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3254
            endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3255
            endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3256
                endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3257
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3258
            newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3259
            (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3260
                newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3261
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3262
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3263
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3264
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3265
    Transcript showCR:'created new sourceContainer for ' , aClass name , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3266
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3267
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3268
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3269
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3270
    "/ the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3271
    "/ (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
  3272
    "/  correctly for all unchanged methodss)
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
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3276
        changeLog := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3277
                        revisionLogOf:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3278
                        fromRevision:newRevision 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3279
                        toRevision:newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3280
                        fileName:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3281
                        directory:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3282
                        module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3283
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3284
        (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3285
            'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3286
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3287
            entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3288
            newString := self revisionStringFromLog:changeLog entry:entry forClass:aClass.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3289
            self updateVersionMethodOf:aClass for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3290
            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3291
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3292
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3293
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3294
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3295
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3296
    Class addChangeRecordForClassCheckIn:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3297
    self postCheckInClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3298
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3299
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3300
    "Created: / 09-12-1995 / 19:13:37 / cg"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3301
    "Modified: / 23-07-1999 / 19:47:59 / stefan"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3302
    "Modified: / 12-11-2010 / 11:04:42 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3303
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3304
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3305
createContainerForText:someText inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3306
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3307
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3308
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3309
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3310
     startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3311
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3312
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3313
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3314
        cmdOut remove.
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
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3318
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3319
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3320
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3321
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3322
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3323
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3324
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3325
    self activityNotification:'checking for directory ' , checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3326
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3327
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3328
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3329
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3330
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3331
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3332
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3333
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3334
        "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3335
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3336
        tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3337
        [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3338
            aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3339
        ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3340
            ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
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
        aStream nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3345
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3346
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3347
        tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3348
            'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3349
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3350
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3351
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3352
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3353
        "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3354
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3355
        self activityNotification:'adding ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3356
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3357
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3358
            checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3359
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3360
            OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3361
                checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3362
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3363
                self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3364
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3365
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3366
        cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3367
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3368
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3369
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3370
            inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3371
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3372
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3373
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
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
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3377
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3378
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3379
        "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3380
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3381
        self activityNotification:'committing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3382
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3383
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3384
            "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3385
            logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3386
            s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3387
            s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3388
            s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3389
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3390
            cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' >', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3391
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3392
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3393
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3394
            "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3395
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3396
            cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3397
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3398
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3399
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3400
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3401
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3402
            inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3403
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3404
            cmdOut fileSize > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3405
                whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3406
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3407
                whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3408
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3409
            self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3410
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3411
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3412
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3413
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3414
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3415
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3416
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3417
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3418
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3419
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3420
        cmdOut remove.
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
        "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3424
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3425
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3426
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3427
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3428
        "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3429
        "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3430
        (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3431
            'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3432
            "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3433
            "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3434
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3435
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3436
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3437
            idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3438
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3439
                startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3440
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3441
                idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3442
                idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3443
                    'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3444
                    startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3445
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3446
                    'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3447
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3448
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3449
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3450
                l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3451
                endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3452
                endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3453
                    endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3454
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3455
                newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3456
                (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3457
                    newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3458
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3459
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3460
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3461
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3462
        Transcript showCR:'created new sourceContainer for ' , fileName , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3463
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3464
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3465
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3466
    ^ true
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3467
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3468
    "Modified: / 12-11-2010 / 11:04:55 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3469
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3470
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3471
createModule:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3472
    "create a module directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3473
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3474
    |tempdir moduleDir cmdOut cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3475
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3476
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3477
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3478
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3479
    tempdir := self createTempDirectory:nil forModule:moduleName.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3480
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3481
        'CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory' errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3482
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3483
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3484
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3485
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3486
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3487
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3488
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3489
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3490
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3491
    "/ create the module directory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3492
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3493
    moduleDir := tempdir construct:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3494
    moduleDir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3495
        'CVSSourceCodeManager [error]: failed to create: ' errorPrint.  moduleDir name errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3496
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3497
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3498
    ].     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3499
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3500
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3501
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3502
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3503
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3504
    cmd := 'import -m "created from browser" ' , moduleName , ' initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3505
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3506
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3507
        module:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3508
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3509
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3510
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3511
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3512
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3513
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3514
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3515
    'CVSSourceCodeManager [info]: created new module: ' infoPrint. moduleName infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3516
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3517
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3518
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3519
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3520
    "Created: / 09-12-1995 / 19:53:51 / cg"
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3521
    "Modified: / 07-01-1998 / 14:18:57 / stefan"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3522
    "Modified: / 12-11-2010 / 11:00:25 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3523
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3524
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3525
createModule:moduleDirName directory:packageDirName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3526
    "create a package directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3527
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3528
    |tempdir cmdOut cmd packageDir moduleDir relativePath idx parentPackage|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3529
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3530
    "/ any parent package required ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3531
    idx := packageDirName lastIndexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3532
    idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3533
        parentPackage := packageDirName copyTo:idx-1.
1839
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3534
        (self checkForExistingModule:moduleDirName directory:parentPackage) ifFalse:[
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3535
            (self createModule:moduleDirName directory:parentPackage) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3536
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3537
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3538
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3539
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3540
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3541
    (moduleDirName asFilename components includes:'core') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3542
        ('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
  3543
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3544
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3545
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3546
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3547
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3548
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3549
    tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3550
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3551
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3552
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3553
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3554
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3555
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3556
    moduleDir := tempdir construct:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3557
    moduleDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3558
        'CVSSourceCodeManager [error]: command failed: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3559
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3560
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3561
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3562
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3563
        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3564
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3565
    "/ create the package directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3566
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3567
    packageDir := moduleDir construct:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3568
    OperatingSystem errorSignal catch:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3569
        packageDir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3570
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3571
    packageDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3572
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3573
        ('CVSSourceCodeManager [error]: cannot create new directory: ' , packageDir pathName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3574
        ^ false.
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
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3578
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3579
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3580
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3581
    relativePath := moduleDirName asFilename constructString:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3582
    cmd := 'import -m "created from browser" . initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3583
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3584
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3585
        module:moduleDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3586
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3587
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3588
        'CVSSourceCodeManager [error]: output from cvs:' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3589
        (cmdOut contentsOfEntireFile) errorPrint.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3590
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3591
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3592
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3593
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3594
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3595
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3596
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3597
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3598
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3599
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3600
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3601
      self createModule:'stefan' package:'dummy1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3602
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3603
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3604
    "Modified: / 23-07-1999 / 18:40:49 / stefan"
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3605
    "Created: / 23-08-2006 / 14:04:39 / cg"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3606
    "Modified: / 12-11-2010 / 11:00:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3607
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3608
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3609
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
  3610
    "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
  3611
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3612
    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
  3613
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3614
    "
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3615
        self deleteSymbolicName:'stable' path:'stx/libbasic/Array.st'
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3616
        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
  3617
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3618
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3619
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3620
getExistingContainersInModule:aModule directory:aPackage
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3621
    "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
  3622
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3623
    ^ self listNonDirectories:aModule, '/', aPackage
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3624
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3625
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3626
     CVSSourceCodeManager getExistingContainersInModule:'stx' package:'libhtml'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3627
     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
  3628
     CVSSourceCodeManager getExistingContainersInModule:'exept' package:'osi'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3629
    "
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3630
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3631
    "Created: / 23-08-2006 / 14:12:04 / cg"
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3632
!
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3633
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3634
getExistingDirectoriesInModule:aModule
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3635
    "return a list of existing directories."
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3636
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3637
    ^ self listDirectories:aModule.
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3638
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3639
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3640
     CVSSourceCodeManager getExistingDirectoriesInModule:'stx'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3641
     CVSSourceCodeManager getExistingDirectoriesInModule:'cg'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3642
     CVSSourceCodeManager getExistingDirectoriesInModule:'exept'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3643
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3644
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3645
    "Created: / 23-08-2006 / 14:13:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3646
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3647
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3648
getExistingModules
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3649
    "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
  3650
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3651
    ^ self listDirectories:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3652
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3653
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3654
     CVSSourceCodeManager getExistingModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3655
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3656
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3657
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3658
initialRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3659
    "return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3660
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3661
    |cvsRoot|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3662
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3663
    cvsRoot := self getCVSROOTForModule:moduleDir.
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  3664
    cvsRoot := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3665
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3666
        initialRCSRevisionStringFor:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3667
        in:(cvsRoot , '/' , moduleDir , '/' , packageDir)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3668
        container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3669
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  3670
    "Modified: / 16-01-1998 / 17:34:13 / stefan"
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3671
    "Created: / 23-08-2006 / 14:05:46 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3672
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3673
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3674
listDirectories:cvsPath
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3675
    "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
  3676
     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
  3677
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3678
    |directories|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3679
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3680
    self activityNotification:'getting list of directories...'.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3681
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3682
    directories := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3683
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3684
        into:[:fn | directories add:fn]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3685
        nonDirectoriesInto:[:fn | ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3686
    ^ directories asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3687
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3688
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3689
     CVSSourceCodeManager listDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3690
     CVSSourceCodeManager listDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3691
     CVSSourceCodeManager listDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3692
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3693
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3694
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3695
listDirectoriesIn:cvsPath into:dirBlock nonDirectoriesInto:nonDirBlock
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3696
    "enumerate all directories and non-directories in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3697
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3698
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3699
    |cvsRoot inStream line|
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3700
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3701
    cvsRoot := self getCVSROOTForModule:nil.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3702
    cvsRoot isNil ifTrue:[^ self ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3703
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3704
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3705
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3706
                        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
  3707
                        module:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3708
                        inDirectory:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3709
                        log:false 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3710
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3711
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3712
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3713
            self warn:'This operation is not possible with this remoteCVS server'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3714
            ^ self.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3715
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3716
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3717
        [
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3718
            line := inStream atEnd 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3719
                        ifTrue:[nil] 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3720
                        ifFalse:[ inStream nextLine ]. 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3721
            line notNil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3722
        ] whileTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3723
            |idx|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3724
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3725
            (line startsWith:$d) ifTrue:[
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3726
                "/ 'd--- 2005-06-02 17:21:20 +0200 Eigene Dateien'
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3727
                idx := 0.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3728
                4 timesRepeat:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3729
                    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
  3730
                ].
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3731
                dirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3732
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3733
                "/ '---- 2005-06-02 17:21:20 +0200 1.23 .cvsIgnore'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3734
                idx := 0.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3735
                5 timesRepeat:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3736
                    idx := line indexOf:Character space startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3737
                ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3738
                nonDirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3739
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3740
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3741
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3742
        inStream notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3743
            inStream close.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3744
        ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3745
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3746
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3747
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3748
     CVSSourceCodeManager listDirectories:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3749
     CVSSourceCodeManager listDirectories:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3750
     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
  3751
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3752
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3753
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3754
listNonDirectories:cvsPath
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3755
    "return a list of all containers in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3756
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3757
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3758
    |containers|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3759
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3760
    self activityNotification:'getting list of containers...'.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3761
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3762
    containers := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3763
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3764
        into:[:fn | ]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3765
        nonDirectoriesInto:[:fn | containers add:fn].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3766
    ^ containers asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3767
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3768
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3769
     CVSSourceCodeManager listNonDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3770
     CVSSourceCodeManager listNonDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3771
     CVSSourceCodeManager listNonDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3772
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3773
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3774
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3775
newestRevisionInFile:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3776
    "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
  3777
     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
  3778
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3779
    |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
  3780
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3781
    self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3782
         "/ 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
  3783
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3784
        |info|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3785
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3786
        info := self
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3787
                statusOf:nil 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3788
                fileName:classFileName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3789
                directory:packageDir 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3790
                module:moduleDir.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3791
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3792
        info isNil ifTrue:[^ nil].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3793
        ^ info at:#newestRevision ifAbsent:nil
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3794
    ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3795
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3796
    modulePath :=  moduleDir , '/' , packageDir. 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3797
    fullName :=  modulePath , '/' , classFileName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3798
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3799
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3800
        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
  3801
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3802
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3803
                        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
  3804
                        module:moduleDir 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3805
                        inDirectory:tempDir 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3806
                        log:true 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3807
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3808
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3809
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3810
            ('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
  3811
            ^ nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3812
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3813
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3814
        "/
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3815
        "/ 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
  3816
        "/
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3817
        [inStream atEnd] whileFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3818
            line:= inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3819
            line notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3820
                line := line withoutSeparators.
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3821
                line notEmpty ifTrue:[
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3822
                    s := line restAfter:'RCS file:' withoutSeparators:true. 
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3823
                    s notNil ifTrue:[ 
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3824
                        (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3825
                            "/ file has been removed in the repository
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3826
                            ^ #deleted
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3827
                        ].
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3828
                    ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3829
                    s := line restAfter:'head:' withoutSeparators:true.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3830
                    s notNil ifTrue:[ |i|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3831
                        i := s indexOfSeparator.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3832
                        i ~~ 0 ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3833
                            s := s copyTo:i-1
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3834
                        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3835
                        ^ s
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3836
                    ].                        
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3837
                ].                        
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3838
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3839
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3840
        ('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
  3841
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3842
        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
  3843
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3844
    ^ nil
1362
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
     SourceCodeManager newestRevisionInFile:'Array.st' directory:'libbasic' module:'stx'       
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3848
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3849
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3850
    "Modified: / 04-07-2006 / 18:19:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3851
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3852
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3853
newestRevisionsInModule:module directory:packageDir
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3854
    "return a list of filename-module associations for the containers in
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3855
     a package directory.
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3856
     Return nil on failure."
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3857
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  3858
    ^ self revisionsInModule:module directory:packageDir fromDate:nil
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3859
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3860
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3861
     SourceCodeManager 
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  3862
        newestRevisionsInModule:'bosch' directory:'dapasx'   
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  3863
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  3864
        newestRevisionsInModule:'stx' directory:'goodies/net/ssl'   
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3865
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3866
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3867
    "Created: / 12-10-2006 / 10:12:59 / cg"
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3868
!
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3869
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3870
removeContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3871
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3872
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3873
    |fullName tempdir checkoutName cmdOut cmd tempFile whatHappened|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3874
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3875
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3876
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3877
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3878
    (tempdir := self createLocalDirectory:packageDir inModule:moduleDir with:fileName) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3879
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3880
        self reportError:('cannot checkout ',checkoutName,' (cannot create local directory)').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3881
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3882
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3883
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3884
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3885
    "/ and remove it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3886
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3887
    self activityNotification:'removing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3888
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  3889
    RecentlyCheckedModulesAndPackages := nil.   "/ flush (could do better...)
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  3890
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3891
    "/
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3892
    "/ check presence of file there
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3893
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3894
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3895
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3896
        tempdir recursiveRemove.
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3897
        "/ already removed
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3898
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3899
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3900
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3901
    tempFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3902
        tempFile remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3903
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3904
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3905
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3906
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3907
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3908
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3909
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3910
    cmd := 'remove ' , fileName , ' > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3911
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3912
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3913
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3914
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3915
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3916
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3917
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3918
        self reportError:('cannot remove ',checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3919
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3920
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3921
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3922
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3923
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3924
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3925
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3926
    self activityNotification:'committing removal of ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3927
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3928
    cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3929
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3930
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3931
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3932
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3933
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3934
        cmdOut fileSize > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3935
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3936
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3937
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3938
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3939
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3940
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3941
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3942
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3943
The container has NOT been removed into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3944
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3945
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3946
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3947
        self reportError:'cannot remove container'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3948
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3949
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3950
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3951
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3952
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3953
    "/ release the temporary tree towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3954
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3955
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3956
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3957
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3958
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3959
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3960
    "
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3961
     SourceCodeManager checkForExistingContainer:'foo.st' inModule:'stx' directory:'private'. 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3962
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3963
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3964
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3965
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3966
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3967
    "Created: / 13-09-2006 / 18:31:55 / cg"
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  3968
    "Modified (comment): / 19-08-2011 / 10:44:53 / cg"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3969
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3970
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3971
removeContainer:fileName inModule:moduleDir package:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3972
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3973
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  3974
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3975
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3976
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3977
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3978
    "Modified: / 13-09-2006 / 18:32:25 / cg"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3979
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3980
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3981
removeContainerInModule:moduleDir package:packageDir container:fileName
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3982
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3983
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  3984
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3985
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3986
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3987
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3988
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3989
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3990
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3991
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3992
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3993
    "Modified: / 13-09-2006 / 18:31:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3994
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3995
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  3996
reportHistoryLogSince:timeGoal 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  3997
    filterSTSources:filterSTSourcesBool 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  3998
    filterUser:userFilter 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  3999
    filterRepository:filterRep 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4000
    filterModules:filterModules
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4001
    inTo:aBlock
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4002
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4003
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4004
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4005
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4006
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4007
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4008
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4009
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4010
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4011
    |inStream line words recordType fileName user date time rev pkgDir module idx
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4012
     clsName cls clsRev roots info tempDir endReached|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4013
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4014
    CVSRoot isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4015
        'CVSSourceCodeManager [info]: CVSROOT not set' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4016
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4017
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4018
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4019
    filterRep notEmptyOrNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4020
        roots := filterRep.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4021
    ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4022
        roots := Set withAll:(CVSModuleRoots values).
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4023
        roots add:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4024
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4025
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4026
    "/ must do it in a tempDir, to avoid cvs validating the -D arg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4027
    "/ against any info found in CVS/Root
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4028
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4029
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4030
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4031
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4032
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4033
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4034
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4035
    roots do:[:eachCvsRoot |
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4036
        |root host cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4037
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4038
        cmd := 'cvs -d ' , eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4039
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4040
        cmd := cmd , ' history -x ARM -a'.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  4041
        (timeGoal notEmptyOrNil) ifTrue:[
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4042
            cmd := cmd , ' -D "' , timeGoal printString , '"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4043
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4044
        userFilter notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4045
            userFilter isString ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4046
                cmd := cmd , ' -u "' , userFilter , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4047
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4048
                userFilter do:[:user |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4049
                    cmd := cmd , ' -u "' , user , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4050
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4051
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4052
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4053
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4054
"/ The -m and -x options do not work together in cvs history
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4055
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4056
"/        filterModules notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4057
"/            filterModules do:[:aModule |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4058
"/                cmd := cmd , ' -m "' , aModule , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4059
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4060
"/        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4061
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4062
        Transcript showCR:cmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4063
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4064
        inStream := PipeStream readingFrom:cmd inDirectory:tempDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4065
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4066
            ('CVSSourceCodeManager [error]: cannot open pipe to ''cvs history''') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4067
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4068
            inStream class streamErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4069
                ('CVSSourceCodeManager [error]: pipe read error (''cvs history'')') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4070
                ex return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4071
            ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4072
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4073
                "/ read the commands pipe output and reformat the lines
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4074
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4075
                endReached := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4076
                [endReached] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4077
                    inStream readWait.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4078
                    line := inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4079
                    (endReached := line isNil) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4080
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4081
                        "/ cvs history line is of the following format:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4082
                        "/ [Ma] date time +xxx user rev name module/package ....
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4083
                        words := line asCollectionOfWords.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4084
                        words size < 8 ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4085
                            "/ something like 'No records selected' ...
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4086
                        ] ifFalse:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4087
                            "a valid history line"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4088
                            recordType := words at:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4089
                            fileName := words at:7.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4090
                            user := words at:5.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4091
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4092
                            (filterSTSourcesBool not or:[fileName endsWith:'.st']) ifTrue:[
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4093
                                (userFilter isNil or:[userFilter includes:user]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4094
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4095
                                    date := words at:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4096
                                    time := words at:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4097
                                    rev := words at:6.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4098
                                    pkgDir := words at:8.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4099
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4100
                                    module := pkgDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4101
                                    (module startsWith:'./') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4102
                                        module := module copyFrom:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4103
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4104
                                    idx := module indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4105
                                    idx ~~ 0 ifTrue:[    
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4106
                                        module := module copyTo:idx-1.
1362
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
                                    (filterModules isNil 
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4110
                                     or:[filterModules includes:module]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4111
                                        recordType = 'M' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4112
                                            recordType := ' '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4113
                                        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4114
                                            recordType = 'A' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4115
                                                recordType := '+'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4116
                                            ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4117
                                                recordType = 'R' ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4118
                                                    recordType := '-'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4119
                                                ]
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
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4123
                                        info := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4124
                                        info at:#cvsRecordType       put:recordType.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4125
                                        info at:#date                put:date.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4126
                                        info at:#time                put:time.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4127
                                        info at:#user                put:user.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4128
                                        info at:#fileName            put:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4129
                                        info at:#revision            put:rev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4130
                                        info at:#directory           put:pkgDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4131
                                        info at:#className           put:(Smalltalk classNameForFile:fileName).
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4132
                                        info at:#cvsRoot             put:eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4133
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4134
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4135
                                        "/ for your convenience:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4136
                                        "/  check what the actual version is in the image
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4137
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4138
                                        clsName := Smalltalk classNameForFile:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4139
                                        clsName notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4140
                                            cls := Smalltalk classNamed:clsName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4141
                                            (cls notNil and:[(clsRev := cls revision) notNil]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4142
                                                info at:#classesRevision     put:clsRev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4143
                                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4144
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4145
                                        aBlock value:info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4146
                                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4147
                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4148
                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4149
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4150
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4151
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4152
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4153
            inStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4154
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4155
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4156
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4157
    tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4158
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4159
    "Created: / 17-01-2001 / 13:11:20 / cg"
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4160
    "Modified: / 29-08-2006 / 13:17:50 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4161
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4162
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4163
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4164
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4165
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4166
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4167
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4168
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4169
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4170
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4171
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4172
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4173
        reportHistoryLogSince:timeGoal 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4174
        filterSTSources:filter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4175
        filterUser:userFilter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4176
        filterRepository:filterRep 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4177
        filterModules:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4178
        inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4179
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4180
    "Modified: / 17.1.2001 / 13:12:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4181
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4182
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4183
revisionInfoFromString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4184
    "{ Pragma: +optSpace }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4185
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4186
    "return a dictionary filled with revision info.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4187
     This extracts the relevant info from aString."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4188
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4189
    ^ self revisionInfoFromString:aString inClass:nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4190
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4191
    "
2203
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4192
     self revisionInfoFromString:(Array version_CVS)   
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4193
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4194
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4195
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4196
    "Modified: / 01-07-2011 / 13:54:02 / cg"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4197
!
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4198
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4199
revisionInfoFromString:aString inClass:aClass
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4200
    "{ Pragma: +optSpace }"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4201
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4202
    "return a dictionary filled with revision info.
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4203
     This extracts the relevant info from aString."
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4204
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4205
    |fixedString autoFixHolder|
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4206
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4207
    autoFixHolder := UserPreferences current showBadRevisionStringDialogs not asValue.
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4208
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4209
    Dialog aboutToOpenBoxNotificationSignal handle:[:ex |
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4210
        ex parameter addCheckBox:'Do not show this dialog again (always fix & proceed)' on:autoFixHolder.
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4211
        ex proceed.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4212
    ] do:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4213
        "/ temporary fix Felix' bad string translation:
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4214
        (aString startsWith:'§Header:') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4215
            (aString endsWith:'Exp §') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4216
                fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4217
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4218
                aClass isNil ifTrue:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4219
                    autoFixHolder value ifFalse:[
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4220
                        Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4221
                    ]
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4222
                ] ifFalse:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4223
                    (autoFixHolder value 
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4224
                        or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4225
                    ) ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4226
                        self updateVersionMethodOf:aClass for:fixedString.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4227
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4228
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4229
            ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4230
        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4231
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4232
        "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4233
        (aString startsWith:'Header: ') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4234
            (aString endsWith:'Exp ') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4235
                fixedString := '$' , aString , '$'.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4236
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4237
                aClass isNil ifTrue:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4238
                    autoFixHolder value ifFalse:[
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4239
                        Dialog information:'Attention: the CVS version string is corrupted (Umlaut remover-bug). Please fix it manually'.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4240
                    ]
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4241
                ] ifFalse:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4242
                    (autoFixHolder value 
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4243
                        or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (Umlaut remover-bug). Fix it?' withCRs bindWith:aClass name) ]
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4244
                    ) ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4245
                        self updateVersionMethodOf:aClass for:fixedString.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4246
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4247
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4248
            ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4249
        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4250
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4251
        "/ temporary fix translated (§-sign) and not restored strings:
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4252
        (aString startsWith:'§Header: ') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4253
            (aString endsWith:'Exp §') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4254
                fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4255
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4256
                aClass isNil ifTrue:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4257
                    autoFixHolder value ifFalse:[
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4258
                        Dialog information:'Attention: the CVS version string is corrupted (Escaper-bug). Please fix it manually'.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4259
                    ]
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4260
                ] ifFalse:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4261
                    (autoFixHolder value 
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4262
                        or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (Escaper-bug).\\Fix it?' withCRs bindWith:aClass name) ]
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4263
                    ) ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4264
                        self updateVersionMethodOf:aClass for:fixedString.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4265
                    ].
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4266
                ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4267
            ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4268
        ].
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4269
        UserPreferences current showBadRevisionStringDialogs:autoFixHolder value not.
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4270
    ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4271
2545
c98f48b1f15c changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2540
diff changeset
  4272
    ^ CVSVersionInfo fromRCSString:(fixedString ? aString)
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4273
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4274
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4275
     self revisionInfoFromString:(Array version_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4276
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4277
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4278
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4279
    "Created: / 01-07-2011 / 13:51:41 / cg"
2545
c98f48b1f15c changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2540
diff changeset
  4280
    "Modified: / 29-09-2011 / 21:53:47 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4281
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4282
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4283
revisionLogOf:clsOrNil fromRevision:firstRevOrNil toRevision:lastRevOrNil numberOfRevisions:numRevisionsOrNil fileName:classFileName directory:packageDir module:moduleDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4284
    "return info about the repository container and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4285
     (part of) the revisionlog as a collection of revision entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4286
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4287
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4288
     If numRevisionsOrNil is notNil, it limits the number of revision records returned -
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4289
     only numRevions of the newest revision infos will be collected.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4290
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4291
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4292
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4293
            #container          -> the RCS/CVS container file name 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4294
            #cvsRoot            -> the CVS root (repository) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4295
            #filename           -> the actual source file name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4296
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4297
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4298
            #revisions          -> collection of per-revision info (see below)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4299
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4300
            firstRevOrNil / lastRevOrNil specify from which revisions a logEntry is wanted:
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4301
             -If firstRevOrNil is nil, the first revision is the initial revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4302
              otherwise, the log starts with that revision.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4303
             -If lastRevOrNil is nil, the last revision is the newest revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4304
              otherwise, the log ends with that revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4305
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4306
             -If both are nil, all logEntries are extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4307
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4308
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4309
            per revision info consists of one record per revision:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4310
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4311
              #revision              -> the revision string
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4312
              #author                -> who checked that revision into the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4313
              #date                  -> when was it checked in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4314
              #state                 -> the RCS state
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4315
              #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
  4316
              #logMessage            -> the checkIn log message
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4317
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4318
            revisions are ordered newest first 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4319
            (i.e. the last entry is for the initial revision; the first for the most recent one)
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4320
            Attention: if state = 'dead' that revision is no longer valid.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4321
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4322
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4323
    |tempDir fullName modulePath inStream inHeaderInfo atEnd line idx
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4324
     info record revisionRecords s headerOnly msg|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4325
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4326
    self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4327
        tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4328
        tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4329
            ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4330
            ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4331
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4332
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4333
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4334
    [
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4335
        |cmd revArg|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4336
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4337
        modulePath :=  moduleDir , '/' , packageDir. 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4338
        fullName :=  modulePath , '/' , classFileName.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4339
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4340
        self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4341
            self createEntryFor:fullName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4342
                 module:moduleDir
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4343
                 in:(tempDir construct:modulePath) 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4344
                 revision:'1.1' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4345
                 date:'dummy' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4346
                 special:''
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4347
                 overwrite:false.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4348
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4349
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4350
        revArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4351
        headerOnly := false.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4352
        (firstRevOrNil notNil or:[lastRevOrNil notNil]) ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4353
            (firstRevOrNil == 0 and:[lastRevOrNil == 0]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4354
                revArg := '-h'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4355
                headerOnly := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4356
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4357
                revArg := '-r'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4358
                firstRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4359
                    revArg := revArg , firstRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4360
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4361
                revArg := revArg , ':'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4362
                lastRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4363
                    revArg := revArg , lastRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4364
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4365
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4366
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4367
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4368
        headerOnly ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4369
            msg := 'fetching revision info '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4370
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4371
            msg := 'reading revision log '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4372
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4373
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4374
            msg := msg , 'in ' , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4375
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4376
            msg := msg , 'of ', clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4377
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4378
        self activityNotification:msg,'...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4379
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4380
        self use_rlog ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4381
            cmd := ('rlog ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4382
        ] ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4383
            cmd := ('log ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4384
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4385
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4386
        inStream := self 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4387
                        executeCVSCommand:('rlog ' , revArg , ' ' , fullName) 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4388
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4389
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4390
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4391
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4392
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4393
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4394
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4395
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4396
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4397
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4398
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4399
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4400
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4401
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4402
        inHeaderInfo := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4403
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4404
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4405
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4406
                |gotIt|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4407
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4408
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4409
                #('RCS file:'        #container
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4410
                  'Working file:'    #filename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4411
                  'head:'            #newestRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4412
                  'total revisions:' #numberOfRevisions
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4413
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4414
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4415
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4416
                        s notNil ifTrue:[info at:key put:s. gotIt := true].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4417
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4418
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4419
                gotIt ifFalse:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4420
                    (line startsWith:'symbolic names:') ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4421
                        |tags tokens|
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4422
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4423
                        tags := Dictionary new.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4424
                        line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4425
                        [line notNil 
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4426
                         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
  4427
                            tokens := line asCollectionOfSubstringsSeparatedBy:$:.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4428
                            tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4429
                            line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4430
                        ].
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4431
                        info at:#symbolicNames put:tags.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4432
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4433
                    (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4434
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4435
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4436
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4437
        inStream nextLine. "/ skip separating line after description.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4438
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4439
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4440
            ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4441
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4442
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4443
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4444
        "/ strip selected revisions from the total-revisions entry
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4445
        s := info at:#numberOfRevisions.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4446
        (idx := s indexOf:$;) ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4447
            info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4448
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4449
            info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4450
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4451
        headerOnly ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4452
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4453
            "/ continue to read the commands pipe output 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4454
            "/ and extract revision info records
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4455
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4456
            revisionRecords := OrderedCollection new:(info at:#numberOfRevisions).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4457
            info at:#revisions put:revisionRecords.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4458
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4459
            atEnd := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4460
            [atEnd or:[inStream atEnd]] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4461
                record := self readRevisionLogEntryFromStream:inStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4462
                record isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4463
                    atEnd := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4464
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4465
                    revisionRecords add:record.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4466
                ].
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4467
                (numRevisionsOrNil notNil and:[revisionRecords size >= numRevisionsOrNil]) ifTrue:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4468
                    atEnd := true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4469
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4470
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4471
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4472
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4473
        inStream notNil ifTrue:[inStream close].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4474
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4475
        tempDir notNil ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4476
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4477
                ('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
  4478
            ] do:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4479
                tempDir recursiveRemove
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4480
            ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4481
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4482
        self activityNotification:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4483
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4484
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4485
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4486
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4487
     SourceCodeManager revisionLogOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4488
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4489
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4490
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4491
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4492
     SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4493
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4494
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4495
    "Created: / 16-11-1995 / 13:25:30 / cg"
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4496
    "Modified: / 29-01-1997 / 16:51:30 / stefan"
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4497
    "Modified: / 29-08-2006 / 14:57:26 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4498
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4499
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4500
revisionLogOfPackageInDirectory:packageDir module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4501
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4502
     The returned information is a list of structures (IdentityDictionary)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4503
     each filled with:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4504
            #container          -> the RCS/CVS container file name 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4505
            #cvsRoot            -> the CVS root (repository) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4506
            #filename           -> the actual source file name
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4507
            #newestRevision     -> the revisionString of the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4508
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4509
            #revisions          -> collection of per-revision info (see below)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4510
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4511
            firstRev / lastRef specify from which revisions a logEntry is wanted:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4512
             -If firstRev is nil, the first revision is the initial revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4513
              otherwise, the log starts with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4514
             -If lastRef is nil, the last revision is the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4515
              otherwise, the log ends with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4516
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4517
             -If both are nil, all logEntries are extracted.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4518
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4519
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4520
            per revision info consists of one record per revision:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4521
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4522
              #revision              -> the revision string
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4523
              #author                -> who checked that revision into the repository
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4524
              #date                  -> when was it checked in
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4525
              #state                 -> the RCS state
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4526
              #numberOfChangedLines  -> the number of changed line w.r.t the previous
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4527
              #logMessage            -> the checkIn log message
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4528
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4529
            revisions are ordered newest first 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4530
            (i.e. the last entry is for the initial revision; the first for the most recent one)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4531
            Attention: if state = 'dead' that revision is no longer valid.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4532
        "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4533
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4534
    |tempDir modulePath inStream inHeaderInfo atEnd line idx
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4535
     info record revisionRecords s headerOnly msg infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4536
     fn container|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4537
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4538
    self use_rlog ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4539
        tempDir := self createTempDirectory:nil forModule:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4540
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4541
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4542
    [
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4543
        |cmd revArg|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4544
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4545
        modulePath :=  moduleDir , '/' , packageDir. 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4546
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4547
        self use_rlog ifFalse:[
2027
2dca45de7d46 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2021
diff changeset
  4548
self halt:'non-rlog no longer supported'.
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4549
^ self.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4550
"/            self createEntryFor:fullName 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4551
"/                 module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4552
"/                 in:(tempDir construct:modulePath) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4553
"/                 revision:'1.1' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4554
"/                 date:'dummy' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4555
"/                 special:''
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4556
"/                 overwrite:false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4557
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4558
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4559
        revArg := ''.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4560
        headerOnly := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4561
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4562
        headerOnly ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4563
            msg := 'fetching revision info '
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4564
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4565
            msg := 'reading revision log '
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4566
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4567
        msg := msg , 'in package ' , modulePath.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4568
        self activityNotification:msg,'...'.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4569
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4570
        self use_rlog ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4571
            cmd := ('rlog ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4572
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4573
            cmd := ('log ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4574
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4575
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4576
        inStream := self 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4577
                        executeCVSCommand:cmd 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4578
                        module:moduleDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4579
                        inDirectory:tempDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4580
                        log:true 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4581
                        pipe:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4582
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4583
        inStream isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4584
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4585
            ^ nil
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4586
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4587
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4588
        infoCollection := Dictionary new.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4589
        [inStream atEnd] whileFalse:[
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4590
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4591
            "/ read the commands pipe output and extract the container info
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4592
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4593
            info := IdentityDictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4594
            inHeaderInfo := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4595
            [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4596
                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4597
                line notEmptyOrNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4598
                    |gotIt|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4599
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4600
                    gotIt := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4601
                    #('RCS file:'        #container
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4602
                      'Working file:'    #filename
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4603
                      'head:'            #newestRevision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4604
                      'total revisions:' #numberOfRevisions
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4605
                     ) pairWiseDo:[:word :key |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4606
                        gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4607
                            s := line restAfter:word withoutSeparators:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4608
                            s notNil ifTrue:[info at:key put:s. gotIt := true].                        
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4609
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4610
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4611
                    gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4612
                        (line startsWith:'symbolic names:') ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4613
                            |tags tokens|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4614
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4615
                            tags := Dictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4616
                            line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4617
                            [line notNil 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4618
                             and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4619
                                tokens := line asCollectionOfSubstringsSeparatedBy:$:.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4620
                                tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4621
                                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4622
                            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4623
                            info at:#symbolicNames put:tags.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4624
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4625
                        (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4626
                    ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4627
                ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4628
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4629
            inStream nextLine. "/ skip separating line after description.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4630
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4631
            info isEmpty ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4632
                ('CVSSourceCodeManager [warning]: no log for ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4633
            ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4634
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4635
                "/ strip selected revisions from the total-revisions entry
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4636
                s := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4637
                (idx := s indexOf:$;) ~~ 0 ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4638
                    info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4639
                ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4640
                    info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4641
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4642
                headerOnly ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4643
                    |numRevisions|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4644
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4645
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4646
                    "/ continue to read the commands pipe output 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4647
                    "/ and extract revision info records
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4648
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4649
                    numRevisions := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4650
                    revisionRecords := OrderedCollection new:numRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4651
                    info at:#revisions put:revisionRecords.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4652
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4653
                    atEnd := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4654
                    [atEnd or:[inStream atEnd]] whileFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4655
                        record := self readRevisionLogEntryFromStream:inStream.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4656
                        record isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4657
                            atEnd := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4658
                        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4659
                            revisionRecords add:record.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4660
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4661
                        (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4662
                            atEnd := true
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4663
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4664
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4665
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4666
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4667
            fn := info at:#filename ifAbsent:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4668
            fn isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4669
                container := info at:#container ifAbsent:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4670
                fn := container asFilename baseName copyWithoutLast:2.   "/ remove ',v' suffix
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4671
                info at:#filename put:fn.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4672
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4673
            infoCollection at:(info at:#filename) put:info.    
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4674
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4675
    ] ensure:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4676
        inStream notNil ifTrue:[inStream close].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4677
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4678
        tempDir notNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4679
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4680
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4681
            ] do:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4682
                tempDir recursiveRemove
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4683
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4684
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4685
        self activityNotification:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4686
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4687
    ^ infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4688
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4689
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4690
     CVSSourceCodeManager revisionLogOfPackageInDirectory:'libbasic3' module:'stx'  
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4691
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4692
!
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4693
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4694
revisionsInModule:module directory:packageDir fromDate:aDateOrNilForNewest
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4695
    "return a list of filename-module associations for the containers in
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4696
     a package directory. Return nil on failure."
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4697
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4698
    |tempDir modulePath inStream line s info fileName|
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4699
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4700
    self use_rlog ifFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4701
         "/ Uses 'cvs status' - rlog seems not to work
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4702
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4703
        ^ nil.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4704
    ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4705
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4706
    modulePath :=  module , '/' , packageDir. 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4707
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4708
    [
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4709
        |revisionUsed dateSelector searchFor|
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4710
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4711
        self activityNotification:('Fetching revision infos for %1%2'
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4712
                                    bindWith:modulePath
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4713
                                    with:(aDateOrNilForNewest isNil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4714
                                                ifTrue:[ '' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4715
                                                ifFalse:[ ' of ',aDateOrNilForNewest printString])).
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4716
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4717
        dateSelector := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4718
                            ifTrue:[ '-h ' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4719
                            ifFalse:[ '-S -d "%1"' bindWith:(aDateOrNilForNewest printStringFormat:'%y-%m-%d') ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4720
        inStream := self 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4721
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:dateSelector with:modulePath) 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4722
                        module:module 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4723
                        inDirectory:tempDir 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4724
                        log:true 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4725
                        pipe:true.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4726
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4727
        inStream isNil ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4728
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4729
            ^ nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4730
        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4731
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4732
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4733
        "/ read the commands pipe output and extract the container infos
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4734
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4735
        searchFor := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4736
                            ifTrue:[ 'head:' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4737
                            ifFalse:[ 'revision ' ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4738
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4739
        info := OrderedCollection new.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4740
        [inStream atEnd] whileFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4741
            line:= inStream nextLine.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4742
            line notNil ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4743
                line := line withoutSeparators.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4744
                line notEmpty ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4745
                    s := line restAfter:'RCS file:' withoutSeparators:true. 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4746
                    s notNil ifTrue:[ 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4747
                        (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4748
                            "/ file has been removed in the repository
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4749
                            revisionUsed := #deleted
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4750
                        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4751
                        fileName := (UnixFilename named:s) baseName.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4752
                        (fileName endsWith:',v') ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4753
                            fileName := fileName copyWithoutLast:2.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4754
                        ] ifFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4755
                            self halt:'oops - should not happen'.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4756
                        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4757
                    ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4758
                    s := line restAfter:searchFor withoutSeparators:true.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4759
                    s notNil ifTrue:[ |i|
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4760
                        i := s indexOfSeparator.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4761
                        i ~~ 0 ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4762
                            s := s copyTo:i-1
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4763
                        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4764
                        revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4765
                        info add:(fileName -> revisionUsed).
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4766
                        fileName := revisionUsed := nil.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4767
                    ].                        
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4768
                ].                        
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4769
            ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4770
        ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4771
    ] ensure:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4772
        inStream notNil ifTrue:[inStream close].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4773
    ].
2297
c52adb2af4df changed: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2296
diff changeset
  4774
    self breakPoint:#cg.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4775
    ^ info
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4776
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4777
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4778
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4779
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:(Date today subtractDays:7)
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4780
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4781
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4782
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4783
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4784
    "Created: / 12-10-2006 / 10:12:59 / cg"
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4785
!
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4786
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4787
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool class:aClass
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4788
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4789
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4790
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4791
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4792
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4793
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4794
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4795
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4796
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4797
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4798
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4799
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4800
        path:((self sourceInfoOfClass:aClass) at:#pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4801
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4802
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4803
     self setSymbolicName:'foo' revision:nil overWrite:false class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4804
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4805
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4806
     self setSymbolicName:'foo' revision:'1.1' overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4807
     self setSymbolicName:'foo' revision:0 overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4808
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4809
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4810
    "Created: / 12-09-2006 / 12:56:52 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4811
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4812
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4813
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4814
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4815
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4816
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4817
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4818
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4819
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4820
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4821
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4822
    |pathes|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4823
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4824
    pathes := aCollectionOfClasses 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4825
                collect:[:cls | (self sourceInfoOfClass:cls) at:#pathInRepository].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4826
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4827
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4828
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4829
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4830
        pathes:pathes
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4831
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4832
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4833
     self setSymbolicName:'foo' revision:nil overWrite:false classes:(Array with:True with:False)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4834
     self setSymbolicName:'foo' revision:nil overWrite:true classes:(Array with:True with:False)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4835
     self setSymbolicName:'foo' revision:nil overWrite:true classes:(Array with:True with:False)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4836
     self setSymbolicName:'foo' revision:'1.1' overWrite:true classes:(Array with:True with:False)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4837
     self setSymbolicName:'foo' revision:0 overWrite:true classes:(Array with:True with:False)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4838
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4839
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4840
    "Created: / 12-09-2006 / 12:58:23 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4841
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4842
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  4843
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
  4844
    "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
  4845
     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
  4846
     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
  4847
     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
  4848
     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
  4849
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4850
     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
  4851
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4852
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4853
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4854
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4855
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4856
        pathes:(Array with:pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4857
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4858
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4859
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4860
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4861
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4862
     self setSymbolicName:'stable' revision:'1.1' overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4863
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4864
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4865
    "Modified: / 12-09-2006 / 12:37:20 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4866
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4867
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4868
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4869
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4870
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4871
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4872
     If overWriteBool is true, the symbolicName will be changed, even if it has already been set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4873
     If overWriteBool is false, an error will be raised if symbolicName has already been set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4874
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4875
     If filename is nil, the symbolicName for a whole package is set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4876
     If multiple pathes are given, the revision MUST be nil."
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4877
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4878
    |argumentString result errorStream outStream moduleDirs symbolicName|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4879
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4880
    symbolicName := (symbolicNameArg includes:Character space) 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4881
                        ifTrue:[ '"',symbolicNameArg,'"' ]
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4882
                        ifFalse:[ symbolicNameArg ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4883
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4884
    pathesInRepository size > 1 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4885
        self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple pathes"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4886
    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4887
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4888
    moduleDirs := pathesInRepository 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4889
                    collect:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4890
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4891
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4892
    moduleDirs do:[:moduleDir |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4893
        |pathesInModule pathesInModuleAsArgument|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4894
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4895
        pathesInModule := pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4896
                    select:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4897
                        |moduleOfThisPath|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4898
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4899
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4900
                        moduleOfThisPath = moduleDir
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4901
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4902
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4903
        rev = 0 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4904
            argumentString := ' -d '.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4905
        ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4906
            argumentString := ' -r ', (rev ? 'HEAD').
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4907
            overWriteBool ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4908
                argumentString := argumentString, ' -F'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4909
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4910
        ].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4911
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4912
        pathesInModuleAsArgument := pathesInModule 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4913
                                        collect:[:eachPath |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4914
                                            (eachPath includes:Character space) ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4915
                                                '"',eachPath,'"'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4916
                                            ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4917
                                                eachPath
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4918
                                            ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4919
                                        ].
1790
50c24ca2ae45 fix setting tags on more than one file
Stefan Vogel <sv@exept.de>
parents: 1788
diff changeset
  4920
        pathesInModuleAsArgument := pathesInModuleAsArgument asStringCollection asStringWith:Character space.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4921
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4922
        self activityNotification:'setting symbolic name for: ', pathesInModuleAsArgument.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4923
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4924
        errorStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4925
        outStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4926
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4927
        result := self  
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4928
                    executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathesInModuleAsArgument) 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4929
                    module:moduleDir 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4930
                    inDirectory:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4931
                    log:true
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4932
                    outputTo:outStream
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4933
                    errorTo:errorStream.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4934
        (result not or:[errorStream size ~~ 0]) ifTrue:[
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4935
            SourceCodeManagerError raiseWith:errorStream contents errorString:' cvs tag failed: ', pathesInModuleAsArgument.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4936
        ].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4937
        (outStream contents asStringCollection contains:[:someLine| someLine startsWithAnyOf:'WE']) ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4938
            SourceCodeManagerError raiseWith:outStream contents errorString:' cvs tag could not be set: ', pathesInModuleAsArgument.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4939
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4940
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4941
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4942
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4943
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4944
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4945
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4946
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4947
        setSymbolicName:'test1' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4948
        revision:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4949
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4950
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4951
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4952
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4953
        setSymbolicName:'test2' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4954
        revision:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4955
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4956
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4957
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4958
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4959
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4960
        setSymbolicName:'test2' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4961
        revision:0 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4962
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4963
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4964
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4965
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4966
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4967
    "Created: / 12-09-2006 / 12:36:44 / cg"
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4968
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4969
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4970
statusOf:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4971
    "return info about the status repository container.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4972
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4973
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4974
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4975
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4976
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4977
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4978
     This is much faster than revisionLog info (especially, if there are many revisions),
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4979
     and all we need is a classes newest version number.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4980
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4981
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4982
    |tempDir fullName modulePath inStream line   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4983
     info s msg|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4984
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4985
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4986
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4987
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4988
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4989
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4990
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4991
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4992
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4993
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4994
        self createEntryFor:fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4995
             module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4996
             in:(tempDir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4997
             revision:'1.1' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4998
             date:'dummy' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4999
             special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5000
             overwrite:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5001
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5002
        msg := 'fetching status info of '.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5003
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5004
            msg := msg , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5005
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5006
            msg := msg , clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5007
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5008
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5009
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5010
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5011
                        executeCVSCommand:('status ' , fullName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5012
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5013
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5014
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5015
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5016
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5017
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5018
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5019
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5020
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5021
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5022
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5023
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5024
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5025
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5026
        [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5027
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5028
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5029
                line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5030
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5031
            line size > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5032
                |gotIt i|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5033
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5034
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5035
                #(
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5036
                  'Repository revision:'  #newestRevision
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5037
                  'File:'  #fileStatus
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5038
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5039
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5040
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5041
                        s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5042
                            i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5043
                            i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5044
                                s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5045
                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5046
                            info at:key put:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5047
                            gotIt := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5048
                        ].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5049
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5050
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5051
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5052
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5053
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5054
            ('CVSSourceCodeManager [warning]: no status for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5055
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5056
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5057
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5058
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5059
        tempDir recursiveRemove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5060
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5061
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5062
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5063
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5064
     SourceCodeManager statusOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5065
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5066
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5067
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5068
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5069
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5070
    "Modified: / 29-08-2006 / 13:18:00 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5071
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5072
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5073
!CVSSourceCodeManager class methodsFor:'testing'!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5074
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5075
isCVS
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5076
    ^ true
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5077
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5078
    "Created: / 16-08-2006 / 10:58:19 / cg"
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5079
! !
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5080
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5081
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5082
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  5083
version
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
  5084
    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.420 2012-01-14 20:19:43 cg Exp $'
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5085
!
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5086
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5087
version_CVS
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
  5088
    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.420 2012-01-14 20:19:43 cg Exp $'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5089
! !
1170
Claus Gittinger <cg@exept.de>
parents: 1159
diff changeset
  5090
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  5091
CVSSourceCodeManager initialize!