CVSSourceCodeManager.st
author Claus Gittinger <cg@exept.de>
Thu, 06 Jun 2013 22:17:54 +0200
changeset 3294 a3aa19619c3c
parent 3292 8c2434d22b1d
child 3295 e98ab6c72ab1
permissions -rw-r--r--
class: CVSSourceCodeManager changed: #setSymbolicName:revision:overWrite:pathes:
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
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    15
	instanceVariableNames:''
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    16
	classVariableNames:'CVSRoot RemoteCVS CVSModuleRoots CMD_checkout CVSTempDir
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    17
		DisabledModules CVSCommandSemaphore CVSExecutable
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    18
		CVSCommitOptions CVSUpdateOptions CVSCommandTimeout
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
    19
		RecentlyCheckedModulesAndPackages RecentTag'
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
    20
	poolDictionaries:''
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
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
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   188
addExeptsPublicRepositoryToModuleRoots
2929
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   189
    CVSModuleRoots at:'stx' put:(self exeptsPublicSTXRepositoryModuleRoot)
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   190
!
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   191
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   192
exeptsPublicSTXRepositoryModuleRoot
7eaac7d0dab5 added: #exeptsPublicSTXRepositoryModuleRoot
Claus Gittinger <cg@exept.de>
parents: 2928
diff changeset
   193
    ^ ':pserver:cvs@cvs.smalltalk-x.de:/cvs/stx'.
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   194
!
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   195
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   196
forgetDisabledModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   197
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   198
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   199
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   200
initCommands
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   201
    CMD_checkout := 'cvs -n checkout %1'.
1874
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   202
30d39369c9bc changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1862
diff changeset
   203
    "Modified: / 13-10-2006 / 00:44:13 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   204
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   205
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   206
initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   207
    "check if $CVSROOT (the shell variable) or CVSRoot (the smalltalk global)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   208
     is set, check if cvs commands can be executed and install myself as the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   209
     SourceCodeManager if this works out ok"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   210
3106
9bfea735aa59 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3104
diff changeset
   211
    | s f top cvsCmd |
9bfea735aa59 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3104
diff changeset
   212
9bfea735aa59 class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 3104
diff changeset
   213
    CVSCommandSemaphore := (Semaphore new:10) name:'Concurrent CVS Commands'.    "/ 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
   214
    CVSCommitOptions := ''.
9c0393c0dda9 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   215
    CVSUpdateOptions := ''.
1465
b28d95c4f867 *** empty log message ***
sr
parents: 1464
diff changeset
   216
    RemoteCVS := true.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   217
    DisabledModules := nil.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   218
    CVSModuleRoots isNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   219
        CVSModuleRoots := Dictionary new.
2928
34adae678b19 added: #addExeptsPublicRepositoryToModuleRoots
Claus Gittinger <cg@exept.de>
parents: 2927
diff changeset
   220
        "/ self addExeptsPublicRepositoryToModuleRoots.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   221
    ].
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   222
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   223
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   224
    "/ if CVSROOT is non-empty and both cvs and co are available
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   225
    "/ as commands, assume this system uses a cvs source code management.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   226
    "/
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   227
    CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   228
        CVSRoot := OperatingSystem getEnvironment:'CVSROOT'.
1929
4081e9216069 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1917
diff changeset
   229
        CVSRoot isNil ifTrue:[
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   230
            "disabled since $CVSROOT is not set"
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   231
            ^ self
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   232
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   233
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   234
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   235
    cvsCmd := self cvsExecutable.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   236
2814
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   237
"/    ok := OperatingSystem canExecuteCommand:cvsCmd.
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   238
"/    ok ifFalse:[
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   239
"/        'CVSSourceCodeManager [warning]: disabled because no >>cvs<< command was found' infoPrintCR.
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   240
"/        ^ self
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   241
"/    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   242
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   243
    UseWorkTree := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   244
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   245
    CacheDirectoryName isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   246
        self initCacheDirPath.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   247
    ].
2098
2d26109579aa ifNil eliminated
Claus Gittinger <cg@exept.de>
parents: 2079
diff changeset
   248
    CachingSources isNil ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   249
        CachingSources := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   250
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   251
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   252
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   253
    "/ check if there is an stx directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   254
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   255
    ((f := CVSRoot asFilename) isDirectory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   256
    and:[(top := f construct:'stx') isDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   257
    and:[top isReadable]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   258
        RemoteCVS := false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   259
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   260
1493
079d236141ef leave SourceCodeManager uninitialized
Michael Beyl <mb@exept.de>
parents: 1489
diff changeset
   261
"/    Smalltalk at:#SourceCodeManager put:self.
2726
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   262
    DefaultManager isNil ifTrue:[
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   263
        DefaultManager := self.    
84aaf535d6c3 changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2721
diff changeset
   264
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   265
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   266
    ('CVSSourceCodeManager [info]: repository CVSROOT is ''' , CVSRoot , '''.') infoPrintCR.
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   267
    RemoteCVS ifFalse:[
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   268
        'CVSSourceCodeManager [info]: using faster local CVS mode' infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   269
        ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   270
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   271
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   272
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   273
    "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   274
    "/ if non-nil, a working tree is kept there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   275
    "/ and updated/commited files are not removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   276
    "/ If you use a regular (make-) tree, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   277
    "/ set WorkTreeDirectoryName (or the environment variable) to that.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   278
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   279
    "/ this is not yet finished.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   280
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   281
    s := OperatingSystem getEnvironment:'STX_WORKTREE'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   282
    s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   283
        WorkTreeDirectoryName := s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   284
        UseWorkTree := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   285
    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   286
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   287
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   288
     AbstractSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   289
     CVSSourceCodeManager initialize
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   290
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   291
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   292
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   293
     CVSRoot := '/files/CVS'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   294
     AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   295
     CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   296
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   297
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   298
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   299
     CVSRoot := ':pserver:cg@cvs.bh.exept.de:/cvs/stx'.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   300
     AbstractSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   301
     CVSSourceCodeManager initialize.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   302
     SourceCodeManager := CVSSourceCodeManager.
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   303
    "
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   304
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   305
    "Created: / 04-11-1995 / 19:14:38 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   306
    "Modified: / 19-12-1995 / 14:25:46 / stefan"
2814
e93c0aa8c45f changed: #initialize
Claus Gittinger <cg@exept.de>
parents: 2792
diff changeset
   307
    "Modified: / 20-03-2012 / 19:06:35 / cg"
1362
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
initializeForRepository:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   311
    "set the global CVSROOT directory (i.e. the repositories name).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   312
     And reinitialize. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   313
     Can be used from the launcher to change/configure the repository."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   314
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   315
    self repositoryName:aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   316
    AbstractSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   317
    CVSSourceCodeManager initialize.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   318
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   319
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   320
     CVSSourceCodeManager initializeForRepository:'/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   321
     CVSSourceCodeManager initializeForRepository:'ibm:/files/CVS'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   322
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   323
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   324
    "Created: / 13.8.1997 / 17:20:57 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   325
    "Modified: / 25.9.1997 / 12:28:05 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   326
    "Modified: / 2.11.1997 / 17:08:27 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   327
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   328
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   329
!CVSSourceCodeManager class methodsFor:'accessing'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   330
2011
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   331
CVSCommitOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   332
    ^ CVSCommitOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   333
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   334
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   335
CVSCommitOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   336
    CVSCommitOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   337
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   338
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   339
CVSUpdateOptions
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   340
    ^ CVSUpdateOptions ? ''
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   341
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   342
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   343
CVSUpdateOptions:aString
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   344
    CVSUpdateOptions := aString.
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   345
!
940166eac0f5 +CVSUpdateOptions and CVSCommitOptions to allow for additional flags,
Claus Gittinger <cg@exept.de>
parents: 2010
diff changeset
   346
1809
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   347
cvsBinDirectory:ignoredString
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   348
    "ignored - for backward compatibility (to read old settings files)"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   349
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   350
    "Created: / 21-09-2006 / 17:26:43 / cg"
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   351
!
73ecfa90a34f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1808
diff changeset
   352
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   353
cvsCommandTimeout
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   354
    ^ CVSCommandTimeout ? ("360" 120 seconds)
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   355
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   356
    "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
   357
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   358
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   359
cvsCommandTimeout:aTimeDuration
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   360
    CVSCommandTimeout := aTimeDuration asTimeDuration.
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   361
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   362
    "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
   363
!
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   364
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   365
cvsExecutable
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   366
    "return the name of the cvs executable."
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   367
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   368
    ^ CVSExecutable ? 'cvs'
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   369
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   370
    "Created: / 21-09-2006 / 15:31:12 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   371
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   372
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   373
cvsExecutable:aString
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   374
    "set the name of the cvs executable."
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   375
1829
bc9065af3347 *** empty log message ***
ca
parents: 1813
diff changeset
   376
    aString isEmptyOrNil ifTrue:[
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   377
        CVSExecutable := nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   378
    ] ifFalse:[        
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   379
        CVSExecutable := aString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   380
    ].
1808
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   381
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   382
    "Created: / 21-09-2006 / 15:31:59 / cg"
d3e667543b00 use CVSExecutable instead of CVSBindir
Claus Gittinger <cg@exept.de>
parents: 1803
diff changeset
   383
    "Modified: / 21-09-2006 / 16:41:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   384
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   385
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   386
cvsTmpDirectory
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   387
    "return the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   388
     That's the directory, where temporary files are created for checkin/checkout.
3274
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   389
     If nil, a directory under the system's default tempDirectory is used."
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   390
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   391
    |d|
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   392
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   393
    CVSTempDir notNil ifTrue:[^ CVSTempDir].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   394
    d := Filename tempDirectory / 'stx_cvs'.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   395
    d exists ifFalse:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   396
        d recursiveMakeDirectory.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   397
    ].
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
   398
    ^ d pathName
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   399
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   400
    "
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   401
     CVSTempDir := nil   
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   402
    "
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   403
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   404
    "Modified (comment): / 24-09-2012 / 11:09:38 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   405
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   406
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   407
cvsTmpDirectory:aPathNameString
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   408
    "set the name of the tmp repository.
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   409
     That's the directory, where temporary files are created for checkin/checkout.
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   410
     If nil, the system's default tempDirectory is used."
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   411
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   412
    CVSTempDir := aPathNameString
2721
427b55df02fb changed:
Claus Gittinger <cg@exept.de>
parents: 2701
diff changeset
   413
2921
225ef2c74066 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
   414
    "Modified (comment): / 24-09-2012 / 11:09:34 / cg"
1407
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   415
!
f8314a9474cf tempDir handling
penk
parents: 1406
diff changeset
   416
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   417
knownModules
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   418
    "return the modules, we currently know"
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   419
2686
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   420
    CVSModuleRoots isEmptyOrNil ifTrue:[^ #() ].
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   421
    ^ CVSModuleRoots keys
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   422
Claus Gittinger <cg@exept.de>
parents: 2671
diff changeset
   423
    "Modified: / 26-12-2011 / 00:49:03 / cg"
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   424
!
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   425
1482
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   426
knownRepositories
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   427
    "return the modules, we currently know"
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   428
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   429
    ^ CVSModuleRoots values copyWith:CVSRoot 
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   430
!
1492af4820e0 cvs history / show user name
Stefan Vogel <sv@exept.de>
parents: 1481
diff changeset
   431
3292
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   432
recentTag
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   433
    "a place to remember recently set tags (to share between File and SystemBrowser)"
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   434
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   435
    ^ RecentTag
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   436
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   437
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   438
recentTag:aString
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   439
    "a place to remember recently set tags (to share between File and SystemBrowser)"
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   440
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   441
    RecentTag := aString
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   442
!
8c2434d22b1d class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3281
diff changeset
   443
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   444
repositoryForPackage:packageId
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   445
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   446
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   447
    ^self getCVSROOTForModule: ( packageId upTo:$:)
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   448
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   449
    "Modified: / 10-10-2011 / 19:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   450
!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   451
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   452
repositoryInfoPerModule
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   453
    "return the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   454
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   455
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   456
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   457
    ^ CVSModuleRoots ? #()
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   458
!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   459
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   460
repositoryInfoPerModule:aDictionary
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   461
    "set the dictionary, which associates CVSRoots to module names.
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   462
     If no entry is contained in this dictionary for some module,
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   463
     the default cvsRoot (CVSRoot) will be used."
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   464
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   465
    CVSModuleRoots := aDictionary
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   466
!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
   467
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   468
repositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   469
    "return the name of the global repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   470
     This is used, if no per-module repository is defined."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   471
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   472
    ^ CVSRoot
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   473
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   474
    "Created: 14.9.1996 / 13:22:05 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   475
    "Modified: 19.9.1997 / 06:12:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   476
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   477
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   478
repositoryName:aDirectoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   479
    "set the name of the repository;
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   480
     that's the name of the global CVSROOT directory, which is used 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   481
     if no specific repository was defined for a module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   482
     Can be used from an rc-script, to override the CVSROOT shell 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   483
     variable setting."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   484
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   485
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   486
    CVSRoot := aDirectoryName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   487
2648
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   488
    "Created: / 14-09-1996 / 13:22:24 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   489
    "Modified: / 19-09-1997 / 06:10:31 / cg"
eba3bc552520 comment: #repositoryName:
Claus Gittinger <cg@exept.de>
parents: 2645
diff changeset
   490
    "Modified (comment): / 21-12-2011 / 14:54:15 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   491
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   492
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   493
repositoryName:aRepositoryName forModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   494
    "set the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   495
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   496
     This can be used from an rc-script, to specify a repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   497
     for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   498
     If left unspecified, the global (i.e. fallBack) repository is used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   499
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   500
    DisabledModules := nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   501
    CVSModuleRoots at:aModuleName put:aRepositoryName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   502
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   503
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   504
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   505
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   506
repositoryNameForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   507
    "return the CVSROOT directory which provides the sources for all 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   508
     classes in a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   509
     Nil is returned for unspecified moduleRoots; in this case, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   510
     the global (i.e. fallBack) repository will be used for source access."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   511
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   512
    ^ CVSModuleRoots at:aModuleName ifAbsent:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   513
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   514
    "Modified: 19.9.1997 / 06:09:40 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   515
    "Created: 19.9.1997 / 06:13:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   516
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   517
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   518
repositoryNameForPackage:packageId 
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   519
    "superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   520
    
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   521
    ^ self getCVSROOTForModule:(packageId upTo:$: )
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   522
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
   523
    "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
   524
    "Modified (format): / 21-12-2011 / 23:03:29 / cg"
2593
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   525
!
e63cc035fdaa added: #repositoryNameForPackage:
vrany
parents: 2568
diff changeset
   526
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   527
repositoryNamesPerModule
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   528
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   529
    "return the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   530
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   531
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   532
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   533
    self obsoleteMethodWarning:'use repositoryInfoPerModule'.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
   534
    ^ CVSModuleRoots 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   535
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   536
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   537
repositoryNamesPerModule:aDictionary
2079
5baef3b663fc Mark obsolete methods
Stefan Vogel <sv@exept.de>
parents: 2051
diff changeset
   538
    <resource: #obsolete>
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   539
    "set the dictionary, which associates CVSRoots to module names.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   540
     If no entry is contained in this dictionary for some module,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   541
     the default cvsRoot (CVSRoot) will be used."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   542
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
   543
    self obsoleteMethodWarning:'use repositoryInfoPerModule:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   544
    CVSModuleRoots := aDictionary
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   545
! !
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   546
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   547
!CVSSourceCodeManager class methodsFor:'basic administration'!
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   548
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   549
createContainerFor:aClass inModule:moduleName directory:dirName container:fileName
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   550
    "create a new container & check into it an initial version of aClass"
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   551
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
   552
    ^ self shouldImplement
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   553
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   554
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   555
!CVSSourceCodeManager class methodsFor:'misc operations'!
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   556
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   557
changeCVSRoot:newRootString inDirectoryTree:aDirectoryFilename
2104
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   558
    "WARNING: read and understand before executing !!
6f8204a743f9 comments
Claus Gittinger <cg@exept.de>
parents: 2099
diff changeset
   559
     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
   560
     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
   561
     aDirectoryFilename is recursively descended"
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
    aDirectoryFilename asFilename allDirectoriesDo:[:eachDirectoryName|
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   564
        eachDirectoryName baseName = 'CVS' ifTrue:[
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   565
            self activityNotification:eachDirectoryName pathName.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   566
            (eachDirectoryName construct:'Root') writeStream 
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   567
                nextPutLine:newRootString;
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   568
                close.
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   569
        ].
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   570
    ].
2136
a927ffd1c82a changed: #changeCVSRoot:inDirectoryTree:
Claus Gittinger <cg@exept.de>
parents: 2127
diff changeset
   571
    self activityNotification:nil.
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   572
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   573
    "OperatingSystem getLoginName
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   574
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   575
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   576
        inDirectoryTree:'../../../stx'
1962
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   577
ecab2971cd1c comment change
Claus Gittinger <cg@exept.de>
parents: 1929
diff changeset
   578
     self 
1963
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   579
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   580
        inDirectoryTree:'..\..\..\exept'
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   581
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   582
     self 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   583
        changeCVSRoot:':pserver:',OperatingSystem getLoginName,'@cvs.bh.exept.de:/cvs/stx' 
98901fb28bea *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1962
diff changeset
   584
        inDirectoryTree:'..\..\..\cg'
1861
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   585
    "
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   586
! !
ee2942e14d27 New. #changeCVSRoot:inDirectoryTree:
Stefan Vogel <sv@exept.de>
parents: 1859
diff changeset
   587
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   588
!CVSSourceCodeManager class methodsFor:'private'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   589
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   590
checkOut:relativeFilename module:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   591
    "checkout realtiveFilename in tempdir"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   592
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   593
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   594
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   595
    cmd := 'checkout -l ' , relativeFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   596
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   597
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   598
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   599
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   600
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   601
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
      self checkOut:'stx/libbasic/Integer.st' asFilename in:'/tmp' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   605
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   606
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   607
    "Created: / 18.1.2000 / 20:30:01 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   608
    "Modified: / 18.1.2000 / 20:35:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   609
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   610
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   611
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   612
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   613
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   614
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   615
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   616
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   617
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   618
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   619
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   620
        option2:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   621
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   622
    "Created: 10.12.1995 / 17:34:33 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   623
    "Modified: 12.9.1996 / 02:39:06 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   624
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   625
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   626
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   627
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   628
        checkinTroubleDialog:title 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   629
        message:message 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   630
        log:log 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   631
        abortable:abortable 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   632
        option:optionTitle 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   633
        option2:optionTitle2 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   634
        option3:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   635
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   636
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   637
checkinTroubleDialog:title message:message log:log abortable:abortable option:optionTitle option2:optionTitle2 option3:optionTitle3
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   638
    "trouble checking in - open a dialog"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   639
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   640
    |l box list listView optionPressed option2Pressed option3Pressed|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   641
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   642
    l := log collect:[:line | line withTabsExpanded].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   643
    list := SelectionInList with:l.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   644
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   645
    box := Dialog new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   646
    box label:(title).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   647
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   648
    (box addTextLabel:message) borderWidth:0.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   649
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   650
    listView := SelectionInListView on:list.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   651
    listView disable.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   652
    listView height:200.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   653
    box addComponent:(HVScrollableView forView:listView miniScrollerH:true) tabable:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   654
    box addVerticalSpace.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   655
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   656
    abortable ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   657
        box addAbortButton
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   658
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   659
    optionTitle notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   660
        box addOkButton:(Button label:optionTitle action:[optionPressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   661
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   662
    optionTitle2 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   663
        box addOkButton:(Button label:optionTitle2 action:[option2Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   664
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   665
    optionTitle3 notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   666
        box addOkButton:(Button label:optionTitle3 action:[option3Pressed := true. box hide]).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   667
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   668
    box addOkButton.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   669
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   670
    box extent:(box preferredExtent).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   671
    box minExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   672
    box maxExtent:box extent.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   673
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   674
    box open.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   675
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   676
    box destroy.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   677
    optionPressed == true ifTrue:[^ #option].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   678
    option2Pressed == true ifTrue:[^ #option2].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   679
    option3Pressed == true ifTrue:[^ #option3].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   680
    ^ box accepted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   681
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   682
    "Created: 9.9.1996 / 19:12:45 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   683
    "Modified: 12.9.1996 / 02:39:10 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   684
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   685
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   686
createEntryFor:pathInRepository module:aModule in:aDirectory revision:rev date:date special:special overwrite:overwrite
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   687
    "create an CVS/Repository and CVS/Entries entry for filename. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   688
     If the path does not exist, it will be created
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   689
     If overwrite is true, an existing entry will be overwritten.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   690
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   691
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   692
    |filename cvsRoot cvsDir name entries firstPart s path|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   693
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   694
    filename := pathInRepository asFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   695
    cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   696
    entries := cvsDir construct:'Entries'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   697
    name := filename baseName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   698
    firstPart := '/', name, '/'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   699
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   700
    s := entries readStreamOrNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   701
    s isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   702
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   703
        "/ no Repository yet, create one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   704
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   705
        |index root|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   706
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   707
        cvsRoot := self getCVSROOTForModule:aModule.
3277
bdaeba5901f1 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3274
diff changeset
   708
        cvsRoot isNil ifTrue:[ self error:'missing/invalid CVSROOT setting' ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   709
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   710
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   711
        root := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   712
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   713
        "/ create Repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   714
        "/ (notice, contents must be a Unix filename ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   715
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   716
        s := (cvsDir construct:'Repository') writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   717
        path := Filename components:filename directory name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   718
        path := path asStringWith:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   719
        s nextPutLine:(root, '/', path).
3104
798c9c08083f class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2982
diff changeset
   720
        s syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   721
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   722
        "/ make new Entries file.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   723
        s := entries writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   724
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   725
        |newName newStream line|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   726
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   727
        newName := Filename newTemporaryIn:cvsDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   728
        newStream := newName writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   729
        [(line := s nextLine) notNil] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   730
            (line findString:firstPart) ~= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   731
                "/ we have found an entry for ourself.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   732
                "/ If we do not want to overwrite it, clean up everything and return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   733
                overwrite ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   734
                    newName remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   735
                    newStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   736
                    s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   737
                    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   738
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   739
                newStream nextPutLine:line
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   740
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   741
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   742
        newName renameTo:entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   743
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   744
        s := newStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   745
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   746
    s nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
3104
798c9c08083f class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2982
diff changeset
   747
    s syncData; close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   748
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   749
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   750
        self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   751
        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
   752
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   753
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   754
    "Created: / 19-09-1997 / 06:21:02 / cg"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   755
    "Modified: / 07-01-1998 / 14:15:35 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
   756
    "Modified: / 21-06-2006 / 12:13:30 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   757
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   758
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   759
createLocalDirectory:packageDir inModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   760
    "create a local working directory for module/package.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   761
     To speed up things, we checkout the file '.cvsignore', to create
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   762
     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
   763
     Return the name of a temporary directory containing the package"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   764
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   765
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   766
        createLocalDirectory:packageDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   767
        inModule:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   768
        with:'.cvsignore'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   769
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   770
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   771
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   772
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   773
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   774
    "Created: / 23.7.1999 / 19:14:28 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   775
    "Modified: / 26.7.1999 / 17:43:35 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   776
    "Modified: / 18.1.2000 / 20:56:19 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   777
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   778
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   779
createLocalDirectory:packageDir inModule:moduleDir with:fileToCheckout
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   780
    "create a local working directory for module/package, and checkout the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   781
     given file there.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   782
     Return the name of a temporary directory containing the package, or nil"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   783
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   784
    |path absolutePath tempdir workingDir unixPath|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   785
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   786
    path := (moduleDir asFilename construct:packageDir) construct:fileToCheckout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   787
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   788
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   789
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   790
        ('no tempDir - cannot checkout') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   791
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
   792
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   793
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   794
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   795
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   796
            unixPath := path name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   797
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   798
            OperatingSystem isVMSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   799
                self error:'VMS case not yet implemented'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   800
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   801
            unixPath := path name copy replaceAll:$\ with:$/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   802
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   803
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   804
        (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   805
            "dummy file does not exist, so create it"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   806
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   807
            absolutePath := tempdir construct:path.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   808
            absolutePath directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   809
            "now create the file"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   810
            (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   811
                ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   812
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   813
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   814
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   815
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   816
            "now create the dummy file in the repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   817
            (self import:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   818
                ('CVSSourceCodeManager [error]: cannot import dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   819
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   820
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   821
            "remove the path, so that checkout works"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   822
            (tempdir construct:moduleDir) recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   823
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   824
            "checkout the dummy, the intermediate directories will be created"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   825
            (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   826
                ('CVSSourceCodeManager [warning]: import failed (to create working dir)') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   827
"/false ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   828
"/                "/ manually create it
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   829
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   830
"/                (tempdir construct:unixPath) directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   831
"/                workingDir := tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   832
"/                unixPath asFilename directory components do:[:each |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   833
"/                    self executeCVSCommand:('add ' , each) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   834
"/                    workingDir := workingDir construct:each.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   835
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   836
"/                (absolutePath writeStream close) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   837
"/                    ('CVSSourceCodeManager [error]: cannot create dummy') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   838
"/                    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   839
"/                    ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   840
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   841
"/                self executeCVSCommand:('add ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   842
"/                self executeCVSCommand:('commit ' , fileToCheckout) module:moduleDir inDirectory:workingDir.
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
                tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   847
                ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   848
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   849
        ].
1406
725a5b2866f2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1405
diff changeset
   850
    ] ifCurtailed:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   851
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   852
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   853
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   854
    ^ tempdir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   855
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   856
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   857
     self createLocalDirectory:'libbasic' inModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   858
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   859
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
   860
    "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
   861
    "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
   862
    "Modified: / 29-08-2006 / 13:17:32 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   863
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   864
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   865
createTempDirectory:packageDir forModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   866
    "create a temp directory for checking out"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   867
3267
d64ae11a21d4 refactored common code
Claus Gittinger <cg@exept.de>
parents: 3265
diff changeset
   868
    ^ self createTempDirectory:packageDir forModule:moduleDir in:(self cvsTmpDirectory)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   869
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   870
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   871
cvsTimeString:timestamp
1388
6fae02877da5 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 1387
diff changeset
   872
    "convert a Timestamp to a string suitable for the CVS/Entries file:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   873
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   874
                         123456789012345678901234
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   875
                         Tue Dec 19 20:56:26 1995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   876
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   877
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   878
    ^ timestamp printStringFormat:'%(ShortDayName) %(ShortMonthName) %(day) %h:%m:%s %(year)' language:#en.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   879
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   880
    "
2311
41e973dcc99b changed: #cvsTimeString:
Stefan Vogel <sv@exept.de>
parents: 2297
diff changeset
   881
     CVSSourceCodeManager cvsTimeString:(UtcTimestamp now)
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   882
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   883
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   884
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   885
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   886
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   887
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   888
     This also leads to a log-entry to be added to cvs's logfile."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   889
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   890
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   891
        executeCVSCommand:cvsCommand 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   892
        module:moduleName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   893
        inDirectory:dir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   894
        log:true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   895
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   896
    "Modified: / 20.5.1998 / 16:07:28 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   897
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   898
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   899
executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   900
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   901
     if dir ~= nil, execute command in that directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   902
     The doLog argument, if false supresses a logEntry to be added 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   903
     in the cvs log file (used when reading / extracting history)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   904
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   905
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   906
        executeCVSCommand:cvsCommand module:moduleName inDirectory:dir log:doLog 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   907
        pipe:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   908
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   909
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   910
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
   911
    ^ self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   912
        executeCVSCommand:cvsCommand
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   913
        module:moduleName
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   914
        inDirectory:dirArg
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   915
        log:doLog
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   916
        outputTo:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   917
        errorTo:errorStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   918
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   919
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
   920
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
   921
    "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
   922
     execute command in the dirArg directory.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   923
     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
   924
     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
   925
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   926
    ^ self 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   927
        executeCVSCommand:cvsCommand 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   928
        module:moduleName 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   929
        inDirectory:dirArg 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   930
        log:doLog 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   931
        pipe:false 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   932
        orElseOutputTo:outStream errorTo:errorStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   933
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
   934
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
   935
    "Created: / 20-05-1998 / 16:06:34 / 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
   936
    "Modified: / 13-10-2011 / 17:07:07 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   937
    "Modified: / 28-02-2012 / 17:31:34 / cg"
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   938
!
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
   939
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
   940
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   941
    "execute command and prepend cvs command name and global options.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   942
     execute command in the dirArg directory.
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
   943
     The doLog argument, if false supresses a logEntry to be added
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   944
     in the cvs log file (used when reading / extracting history)"
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
   945
    
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   946
    ^ self 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   947
        executeCVSCommand:cvsCommand 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   948
        module:moduleName 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   949
        inDirectory:dirArg 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   950
        log:doLog 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   951
        pipe:doPipe 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   952
        orElseOutputTo:nil errorTo:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   953
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   954
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   955
    "Created: / 20-05-1998 / 16:06:34 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   956
    "Modified: / 10-10-2011 / 14:47:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   957
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   958
    "Modified: / 28-02-2012 / 17:31:06 / cg"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   959
!
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   960
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   961
executeCVSCommand:cvsCommand module:moduleName inDirectory:dirArg log:doLog pipe:doPipe orElseOutputTo:outStreamOrNil errorTo:errorStreamOrNil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   962
    "execute command and prepend cvs command name and global options.
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   963
     execute command in the dirArg directory.
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   964
     The doLog argument, if false supresses a logEntry to be added
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   965
     in the cvs log file (used when reading / extracting history)"
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   966
    
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
   967
    |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
   968
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
   969
    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
   970
        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
   971
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   972
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   973
    cvsRoot := self getCVSROOTForModule:moduleName.
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   974
    cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
   975
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
   976
    command := self cvsExecutable.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   977
    (command includes:Character space) ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
   978
        command := '"' , command , '"'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   979
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   980
    doLog ifFalse:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
   981
        "/ cvs  1.11.14 fails with -l option
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
   982
        "/        command := command , ' -l'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   983
    ].
2598
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   984
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   985
    "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
   986
    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
   987
        (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
   988
            (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
   989
                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
   990
            ]
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   991
        ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   992
    ].
197192cec3c7 On Windows, set CVS_RSH to plink if CVS_RSH is not set and plink is executable
vrany
parents: 2593
diff changeset
   993
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
   994
    command := command , ' -d "' , cvsRoot , '" ' , cvsCommand.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   995
    Verbose == true ifTrue:[
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   996
        ('CVSSourceCodeManager [info]: executing: ' , command , ' [in ' , (pathOfDir ? '.') , ']') infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   997
    ].
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
   998
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
   999
    doPipe ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1000
        rslt := PipeStream 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1001
                    readingFrom:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1002
                    errorDisposition:#inline
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1003
                    inDirectory:pathOfDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1004
        ok := rslt notNil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1005
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1006
        Processor isDispatching ifFalse:[
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1007
            (outStreamOrNil notNil or:[ errorStreamOrNil notNil]) ifTrue:[
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1008
                rslt := ok := OperatingSystem executeCommand:command 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1009
                                        inputFrom:nil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1010
                                        outputTo:outStreamOrNil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1011
                                        errorTo:errorStreamOrNil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1012
                                        auxFrom:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1013
                                        inDirectory:pathOfDir
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1014
                                        lineWise:false
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1015
                                        onError:[:status| false].
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1016
            ] ifFalse:[
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1017
                rslt := ok := OperatingSystem 
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1018
                                executeCommand:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1019
                                errorTo:nil
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1020
                                inDirectory:pathOfDir.
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1021
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1022
        ] ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1023
            CVSCommandSemaphore 
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1024
                critical:[
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1025
                    |p errOut done|
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1026
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1027
                    errOut := WriteStream on:String new.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1028
                    p := [
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1029
                                (outStreamOrNil notNil or:[ errorStreamOrNil notNil]) ifTrue:[
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1030
                                    rslt := ok := OperatingSystem executeCommand:command
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1031
                                                        inputFrom:nil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1032
                                                        outputTo:outStreamOrNil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1033
                                                        errorTo:errorStreamOrNil 
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1034
                                                        auxFrom:nil
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1035
                                                        inDirectory:pathOfDir
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1036
                                                        lineWise:false
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1037
                                                        onError:[:status| false].
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1038
                                ] ifFalse:[
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1039
                                    rslt := ok := OperatingSystem 
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1040
                                                    executeCommand:command
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1041
                                                    errorTo:errOut
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  1042
                                                    inDirectory:pathOfDir.
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1043
                                ]
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1044
                         ] fork.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1045
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1046
                    done := false.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1047
                    [done] whileFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1048
                        done := true.
2697
64b38153013c cvsCommandTimeout can be set in settings dialog
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1049
                        (p waitUntilTerminatedWithTimeout:self cvsCommandTimeout asSeconds) ifTrue:[
2777
4733075b95a5 changed: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2776
diff changeset
  1050
                            (Dialog confirm:('CVS command timeout (%1) for:\\%2\\Hint: you can change this timeout in the launcher''s settings dialog.\Proceed?' withCRs 
2696
b07662eb1f51 changed: #executeCVSCommand:module:inDirectory:log:pipe:
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1051
                                                    bindWith:self cvsCommandTimeout with:command)) ifTrue:[
2695
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1052
                                done := false
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1053
                            ] ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1054
                                ('CVSSourceCodeManager [info]: command timeout: ' , command) errorPrintCR.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1055
                                p terminate.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1056
                                ok := false.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1057
                                errorString := 'CVS command timeout'.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1058
                            ]
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1059
                        ] ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1060
                            ok ifFalse:[
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1061
                                errorString := errOut contents.
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1062
                            ].
2cc0732cfa02 changed:
Claus Gittinger <cg@exept.de>
parents: 2686
diff changeset
  1063
                        ]
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1064
                    ].
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1065
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1066
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1067
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1068
    ok ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1069
        ('CVSSourceCodeManager [info]: command failed: ' , command) errorPrintCR.
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  1070
        self breakPoint:#cg.
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1071
        self breakPoint:#jv.
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  1072
        SourceCodeManagerError isHandled ifTrue:[
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  1073
            SourceCodeManagerError 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
  1074
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1075
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1076
    ^ rslt
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1077
1508
06d441988888 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1078
    "Modified: / 23-04-1996 / 15:24:00 / stefan"
2568
4784aa5bb6c0 Lost methods
vrany
parents: 2545
diff changeset
  1079
    "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
  1080
    "Modified (format): / 13-10-2011 / 17:06:28 / jv"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  1081
    "Created: / 28-02-2012 / 17:30:34 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1082
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1083
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1084
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1085
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1086
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1087
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1088
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1089
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1090
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1091
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1092
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1093
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1094
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1095
            line notEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1096
                s := line restAfter:'RCS file:' withoutSeparators:true. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1097
                s notNil ifTrue:[ 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1098
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1099
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1100
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1101
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1102
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1103
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1104
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1105
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1106
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1107
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1108
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1109
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1110
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1111
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1112
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1113
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1114
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1115
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1116
                    info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1117
                    fileName := revisionUsed := nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1118
                ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1119
            ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1120
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1121
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1122
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1123
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1124
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1125
fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor ignoreDeleted:ignoreDeleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1126
    "helper for revisionsInModule*"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1127
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1128
    |info line s revisionUsed fileName|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1129
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1130
    info := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1131
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1132
    [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1133
        line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1134
        line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1135
            line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1136
            line notEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1137
                s := line restAfter:'RCS file:' withoutSeparators:true. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1138
                s notNil ifTrue:[ 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1139
                    (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1140
                        "/ file has been removed in the repository
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1141
                        revisionUsed := #deleted
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1142
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1143
                    fileName := (UnixFilename named:s) baseName.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1144
                    (fileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1145
                        fileName := fileName copyButLast:2.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1146
                    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1147
                        self halt:'oops - should not happen'.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1148
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1149
                ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1150
                s := line restAfter:searchFor withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1151
                s notNil ifTrue:[ |i|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1152
                    i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1153
                    i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1154
                        s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1155
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1156
                    revisionUsed := revisionUsed ? s.  "/ deleted-info comes from the Attic-component in the path
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1157
                    (revisionUsed ~~ #deleted or:[ ignoreDeleted not ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1158
                        info add:(fileName -> revisionUsed).
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1159
                    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1160
                    fileName := revisionUsed := nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1161
                ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1162
            ].                        
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1163
        ]
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1164
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1165
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1166
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  1167
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1168
getCVSROOTForModule:aModuleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1169
    "internal: used when accessing a source repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1170
     Return the CVSROOT which provides the sources for a particular module.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1171
     If no specific root was defined for that module, return the value of
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1172
     the global (fallBack) CVSRoot.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1173
     Nil is returned if no repository is available." 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1174
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1175
    CVSModuleRoots isNil ifTrue:[^ CVSRoot].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1176
    aModuleName isNil ifTrue:[^ CVSRoot].
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  1177
    ^ CVSModuleRoots at:aModuleName ifAbsent:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1178
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1179
    "Created: / 19.9.1997 / 06:18:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1180
    "Modified: / 20.5.1998 / 16:30:12 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1181
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1182
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1183
getCVSROOTsPerModule
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1184
    "return a dictionary, which associates CVSRoots to modules" 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1185
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1186
    ^ CVSModuleRoots ? #()
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1187
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1188
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1189
import:moduleDir in:tempdir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1190
    "import the existing tree in tempdir as repository"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1191
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1192
    |cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1193
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1194
    cmd := 'import -m "checkin from stx browser" . initialV initialR'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1195
    ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1196
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1197
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1198
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1199
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1200
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1201
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1202
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1203
      |f d|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1204
      f := 'stefan/dummy/fasel'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1205
      d := '/tmp/tt' asFilename construct:f.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1206
      d directory recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1207
      d writeStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1208
      self import:'stefan' in:'/tmp/tt/stefan' asFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1209
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1210
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1211
    "Created: / 23.7.1999 / 19:19:34 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1212
    "Modified: / 26.7.1999 / 17:46:29 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1213
    "Modified: / 18.1.2000 / 20:21:32 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1214
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1215
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1216
readRevisionLogEntryFromStream:inStream
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1217
    "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
  1218
     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
  1219
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1220
     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
  1221
     filled with:
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1222
              #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
  1223
              #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
  1224
              #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
  1225
              #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
  1226
              #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
  1227
              #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
  1228
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1229
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1230
    |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
  1231
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1232
    atEnd := false.
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
    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1235
    [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
  1236
        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
  1237
                    revLine1 := nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1238
                   ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1239
                    revLine1 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1240
                  ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1241
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1242
    revLine2 := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1243
    (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
  1244
        record := IdentityDictionary new.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1245
        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
  1246
        "/ 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
  1247
        (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
  1248
            |subEntry|
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1249
            subEntry := info withoutSeparators.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1250
            #('date:'   #date
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1251
              'author:' #author 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1252
              'state:'  #state 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1253
              'lines:'  #numberOfChangedLines
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1254
             ) pairWiseDo:[:word :key |
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1255
                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
  1256
                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
  1257
            ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1258
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1259
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1260
        "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
  1261
        (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
  1262
            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
  1263
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1264
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1265
        s := nil.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1266
        line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1267
        [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
  1268
            (line startsWith:'==========') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1269
                atEnd := true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1270
            ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1271
                (line withoutSpaces = '.') ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1272
                    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
  1273
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1274
                s isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1275
                    s := line
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1276
                ] ifFalse:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1277
                    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
  1278
                ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1279
                line := inStream nextLine.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1280
            ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1281
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1282
        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
  1283
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1284
    ^record.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1285
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1286
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  1287
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1288
releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1289
    "cleanup; release tree towards cvs and remove the temporary tree"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1290
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1291
    |cmd redirect|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1292
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1293
    outputFilename isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1294
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1295
            redirect := 'NUL'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1296
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1297
            redirect := '/dev/null'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1298
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1299
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1300
        redirect := outputFilename name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1301
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1302
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1303
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1304
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1305
    "/
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
  1306
    cmd := 'release > ' , redirect.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1307
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1308
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1309
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1310
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1311
        log:false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1312
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1313
"/        'CVSMGR: failed to release: ' errorPrint. cmd errorPrintNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1314
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1315
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1316
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1317
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1318
    "Modified: / 23.4.1996 / 14:29:49 / stefan"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1319
    "Created: / 19.9.1997 / 06:28:02 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1320
    "Modified: / 20.5.1998 / 16:44:07 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1321
    "Modified: / 3.9.1999 / 14:51:29 / ps"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1322
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1323
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1324
repositoryTopDirectoryFromCVSRoot
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1325
    "return the top of the repository. This handles remote CVS connections
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1326
     as well"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1327
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1328
    CVSRoot isNil ifTrue:[^ nil].
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1329
    ^ self repositoryTopDirectoryFromCVSRoot:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1330
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1331
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1332
     CVSSourceCodeManager repositoryTopDirectory
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1333
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1334
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1335
    "Modified: / 16-01-1998 / 17:33:31 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1336
    "Created: / 21-06-2006 / 12:06:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1337
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1338
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1339
repositoryTopDirectoryFromCVSRoot:aString
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1340
    "return the top of the repository (without remote prefix)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1341
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1342
    |idx|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1343
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1344
    idx := aString indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1345
    idx <= 1 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1346
        ^ aString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1347
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1348
    ^ aString copyFrom:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1349
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1350
    "
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1351
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:':pserver:stefan@ibm.exept.de:/archiv/cvs'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1352
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'exept:/files/CVS'
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1353
     CVSSourceCodeManager repositoryTopDirectoryFromCVSRoot:'/archiv/cvs'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1354
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1355
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1356
    "Modified: / 16-01-1998 / 17:32:03 / stefan"
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  1357
    "Created: / 21-06-2006 / 12:05:53 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1358
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1359
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1360
revisionStringFromLog:log entry:entry forClass:aClass
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1361
    "given a log entry, extract a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1363
    |oldRev idx special|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1364
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1365
    oldRev := aClass revisionString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1366
    special := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1367
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1368
    oldRev notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1369
        idx := oldRev lastIndexOf:$[.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1370
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1371
            idx := oldRev indexOf:$[ startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1372
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1373
                special := ' ' , (oldRev copyFrom:idx).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1374
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1375
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1376
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1377
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1378
    ^ '$Header: ' , (log at:#container) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1379
      ' ' , (entry at:#revision) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1380
      ' ' , (entry at:#date) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1381
      ' ' , (entry at:#author) , 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1382
      ' ' , (entry at:#state) ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1383
      ' $' ,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1384
      special
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1385
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1386
    "Created: 16.9.1996 / 20:24:14 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1387
    "Modified: 3.3.1997 / 22:31:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1388
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1389
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1390
updatedRevisionStringOf:aClass forRevision:newRevision with:originalVersionString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1391
    "update a revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1392
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1393
    |idx leftPart rightPart vsnString newVsn|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1394
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1395
    originalVersionString isEmptyOrNil ifTrue:[^ nil].
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1396
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1397
    "/ search for ,v
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1398
    idx := originalVersionString indexOfSubCollection:'.st,v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1399
    idx == 0 ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1400
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1401
    leftPart := originalVersionString copyTo:(idx - 1 + 5).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1402
    rightPart := (originalVersionString copyFrom:(idx + 5)) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1403
    idx := rightPart indexOfSeparator.
1484
0ea77138c0c5 fix revision string
Claus Gittinger <cg@exept.de>
parents: 1482
diff changeset
  1404
"/    idx == 0 ifTrue:[^ nil].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1405
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1406
    vsnString := rightPart copyTo:idx - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1407
    rightPart := rightPart copyFrom:idx + 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1408
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1409
    newRevision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1410
        (vsnString endsWith:'m') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1411
             "/ alread a modified class
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1412
"/            ('already modified: ' , vsnString) printNL.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1413
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1414
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1415
        newVsn := vsnString , 'm'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1416
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1417
        newVsn := newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1418
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1419
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1420
    ^ leftPart , ' ' , newVsn , ' ' , rightPart
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1421
1912
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1422
    "Created: / 07-12-1995 / 20:23:38 / cg"
d21db2aa6001 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1908
diff changeset
  1423
    "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
  1424
!
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1425
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  1426
use_rlog
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1427
    ^ true "/ OperatingSystem isMSWINDOWSlike not
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1428
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  1429
    "Modified: / 04-07-2006 / 18:05:43 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1430
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1431
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1432
!CVSSourceCodeManager class methodsFor:'queries'!
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1433
2449
vrany
parents: 2403
diff changeset
  1434
isResponsibleForPackage:aString
vrany
parents: 2403
diff changeset
  1435
vrany
parents: 2403
diff changeset
  1436
    | id |
vrany
parents: 2403
diff changeset
  1437
vrany
parents: 2403
diff changeset
  1438
    "JV@2011-07-09: The real check is too slow. Cache needed here"
vrany
parents: 2403
diff changeset
  1439
    ^true.
vrany
parents: 2403
diff changeset
  1440
vrany
parents: 2403
diff changeset
  1441
"/    id := aString asPackageId. 
vrany
parents: 2403
diff changeset
  1442
"/    ^self checkForExistingModule: id module directory: id directory.
vrany
parents: 2403
diff changeset
  1443
vrany
parents: 2403
diff changeset
  1444
    "Created: / 09-07-2011 / 14:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2403
diff changeset
  1445
!
vrany
parents: 2403
diff changeset
  1446
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1447
managerTypeName
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1448
    ^ 'CVS'
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1449
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1450
    "Created: / 16-08-2006 / 11:05:56 / cg"
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1451
!
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1452
2196
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1453
nameOfVersionMethodForExtensions
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1454
    ^ #'extensionsVersion_CVS'
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1455
!
a55cfe0bd6e4 added: #nameOfVersionMethodForExtensions
Claus Gittinger <cg@exept.de>
parents: 2188
diff changeset
  1456
2141
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1457
nameOfVersionMethodInClasses
09a1d1033c9d added nameOfVersionMethodInClasses
Claus Gittinger <cg@exept.de>
parents: 2136
diff changeset
  1458
    ^ #'version_CVS'
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1459
!
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1460
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1461
settingsApplicationClass
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1462
    "link to my settings application (needed for the settings dialog"
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1463
2348
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1464
    ^ CVSSourceCodeManagementSettingsAppl
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1465
ceeffef3bd8d added: #managerClass
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1466
    "Created: / 19-04-2011 / 12:43:29 / cg"
2351
89f497bc9155 added: #settingsApplicationClass
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1467
    "Modified: / 19-04-2011 / 13:52:42 / cg"
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1468
! !
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1469
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1470
!CVSSourceCodeManager class methodsFor:'saving'!
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1471
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1472
savePreferencesOn:aStream
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1473
    aStream nextPutLine:'CVSSourceCodeManager notNil ifTrue:['.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1474
    self repositoryInfoPerModule notEmptyOrNil ifTrue:[
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1475
        aStream nextPutLine:'    CVSSourceCodeManager repositoryInfoPerModule:' , self repositoryInfoPerModule storeString , '.'.
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1476
    ].
1990
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1477
    CVSExecutable notNil ifTrue:[
69b3fcc2f7f6 #cvsExecutable answers the default cvs command
Stefan Vogel <sv@exept.de>
parents: 1989
diff changeset
  1478
        aStream nextPutLine:'    CVSSourceCodeManager cvsExecutable:' , CVSExecutable storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1479
    ].
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1480
    (Smalltalk at:#SourceCodeManager) == self ifTrue:[
1899
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1481
        aStream nextPutLine:'    Smalltalk at:#SourceCodeManager put: CVSSourceCodeManager.'.
e788966f257a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1891
diff changeset
  1482
        aStream nextPutLine:'    CVSSourceCodeManager initializeForRepository:' , self repositoryName storeString , '.'.
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1483
    ] ifFalse:[
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1484
        aStream nextPutLine:'    CVSSourceCodeManager repositoryName:' , self repositoryName storeString , '.'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1485
    ].
2363
33e452b6b57b changed: #savePreferencesOn:
Stefan Vogel <sv@exept.de>
parents: 2361
diff changeset
  1486
    aStream nextPutLine:'].'.
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1487
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1488
    "Created: / 09-11-2006 / 15:09:25 / cg"
2671
4ca06794fb1f refactoring
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1489
    "Modified: / 22-12-2011 / 00:47:28 / cg"
1891
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1490
! !
Claus Gittinger <cg@exept.de>
parents: 1884
diff changeset
  1491
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1492
!CVSSourceCodeManager class methodsFor:'source code access'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1493
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1494
checkin:containerFilename text:someText directory:packageDir module:moduleDir logMessage:logMessage force:force
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1495
    "enter some (source) code (which is someText)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1496
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1497
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1498
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1499
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1500
    |tempdir cmd checkoutName logMsg revision logTmp 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1501
     cmdOut whatHappened s  idx changeLog changesAsLogged l 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1502
     newRevision  msg answer didMerge
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1503
     modulePath time 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1504
     editor checkInRepaired didAccept emphasizedText repairedText out 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1505
     emSep comment|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1506
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1507
    revision := self newestRevisionInFile:containerFilename directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1508
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1509
    logMsg := logMessage.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  1510
    (logMsg isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1511
        logMsg := 'checkin from browser'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1512
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1513
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1514
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1515
    checkoutName :=  modulePath , '/' , containerFilename.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1516
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1517
    revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1518
        "/ a new file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1519
        ^ self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1520
            createContainerForText:someText inModule:moduleDir package:packageDir container:containerFilename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1521
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1522
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1523
    [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1524
        cmdOut := Filename newTemporary.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1525
        cmdOut exists ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1526
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1527
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1528
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1529
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1530
        "/ in CVS, we have to checkout the file first, in order
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1531
        "/ to get up-to-date CVS entries, and also to be able to merge in
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1532
        "/ other users changes.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1533
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1534
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1535
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1536
        "/ first, create a temporary work tree
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1537
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1538
        tempdir := self createTempDirectory:nil forModule:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1539
        tempdir isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1540
            ('no tempDir - cannot checkin ' , containerFilename) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1541
            ^ false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1542
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1543
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1544
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1545
        "/ next, create CVS/Entries and CVS/Repository with version information of current version
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1546
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1547
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1548
        "/ correct our current time, so that converting it will give us UTC
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1549
        time := Timestamp now asUtcTimestamp subtractSeconds:1.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1550
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1551
        self createEntryFor:checkoutName 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1552
             module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1553
             in:(tempdir construct:modulePath) 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1554
             revision:revision
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1555
             date:(self cvsTimeString:time)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1556
             special:''
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1557
             overwrite:true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1558
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1559
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1560
        "/ copy-over our current version
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1561
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1562
        Error handle:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1563
            'CVSSourceCodeManager [error]: cannot copy-over filedOut class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1564
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1565
        ] do:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1566
            s := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1567
            s nextPutAll:someText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1568
            s close.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1569
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1570
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1571
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1572
        "/ synchronize i.e. merge in any changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1573
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1574
        self activityNotification:'merging ' , containerFilename , ' with repository version...'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1575
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1576
        cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1577
        (self 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1578
            executeCVSCommand:cmd 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1579
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1580
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1581
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1582
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1583
                'CVSSourceCodeManager [error]: cannot merge current source with repository version' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1584
                ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1585
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1586
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1587
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1588
            "/ check what happened - the contents of the cmdOut file may be:
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1589
            "/   empty   -> nothing changed
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1590
            "/   M xxx   -> merged-in changes from other users
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1591
            "/   C xxx   -> a conflict occured and the differences have been merged into the source
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1592
            "/              needs special action
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1593
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1594
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1595
                whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1596
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1597
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1598
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1599
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1600
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1601
            "/ no change
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1602
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1603
    "/        Transcript showCR:'no change in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1604
            force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1605
                self information:'nothing changed in ' , containerFilename , ' (repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1606
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1607
            ^ true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1608
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1609
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1610
        Verbose == true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1611
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1612
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1613
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1614
        force ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1615
            revision isNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1616
                changeLog := self revisionLogOfContainer:containerFilename directory:packageDir module:moduleDir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1617
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1618
                changeLog := self revisionLogOfContainer:containerFilename module:moduleDir directory:packageDir fromRevision:(self revisionAfter:revision) toRevision:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1619
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1620
            changeLog notNil ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1621
                s := WriteStream on:String new.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1622
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1623
                changesAsLogged := s contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1624
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1625
                "/ mhmh - that should not happen
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1626
                changesAsLogged := ''.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1627
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1628
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1629
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1630
        didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1631
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1632
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1633
        "/ cvs above rel10 returns a multiline info ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1634
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1635
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1636
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1637
        whatHappened := whatHappened select:[:line |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1638
                            (line startsWith:'RCS file') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1639
                            and:[(line startsWith:'retrieving') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1640
                            and:[(line startsWith:'Merging') not
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1641
                            and:[line size > 0]]]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1642
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1643
        whatHappened := whatHappened asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1644
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1645
        (force or:[whatHappened startsWith:'M ']) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1646
            "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1647
            "/ merged in changes
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1648
            "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1649
            (force 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1650
            or:[changeLog isNil 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1651
            or:[(changeLog at:#revisions ifAbsent:[#()]) isEmpty]]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1652
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1653
                "/ pretty good - nothing has changed in the meanwhile
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1654
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1655
                Transcript showCR:'checking in ' , containerFilename , ' ...'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1656
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1657
                | mySource mergedSource |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1658
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1659
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1660
                "/ someone else has changed things in the meanwhile, but there is no conflict
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1661
                "/ and version have been merged.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1662
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1663
                didMerge := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1664
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1665
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1666
                s := WriteStream on:String new.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1667
                s nextPutAll:someText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1668
                mySource := s contents asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1669
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1670
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1671
                mySource = mergedSource ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1672
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1673
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1674
I have merged your version with the newest repository version, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1675
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1676
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1677
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1678
                    self checkinTroubleDialog:'Merging versions'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1679
                                   message:msg 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1680
                                   log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1681
                                   abortable:false 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1682
                                   option:nil.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1683
                    didMerge := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1684
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1685
                    msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1686
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1687
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1688
into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1689
into a new common revision which may be different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1690
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
  1691
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1692
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1693
most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1694
change methods as required and check in again. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1695
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1696
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1697
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1698
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1699
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1700
                    answer := self checkinTroubleDialog:'Merging versions'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1701
                                   message:msg 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1702
                                   log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1703
                                   abortable:true
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1704
                                   option:'Stop - see first'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1705
                    answer ~~ true ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1706
                        answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1707
                            DiffCodeView
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1708
                                openOn:mySource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1709
                                label:'current version'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1710
                                and:mergedSource
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1711
                                label:'merged version'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1712
                                
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1713
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1714
                        Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1715
                        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1716
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1717
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1718
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1719
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1720
"/                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1721
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1722
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1723
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1724
"/into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1725
"/into a new common revision which is different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1726
"/Although convenient, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1727
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1728
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1729
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1730
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1731
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1732
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1733
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1734
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1735
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1736
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1737
"/                ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1738
                Transcript showCR:'checking in ' , containerFilename , ' (merged other changes) ...'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1739
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1740
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1741
            (whatHappened startsWith:'C ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1742
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1743
                "/ conflict; someone else checked in something in the meanwhile,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1744
                "/ and there is a conflict between this version and the checked in version.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1745
                "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1746
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1747
                changesAsLogged := changesAsLogged asCollectionOfLines.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1748
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1749
                msg := 'The source of ' , containerFilename , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1750
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1751
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1752
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1753
You should fix things by comparing your class with the most recent repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1754
and change your methods avoiding conflicts. The checkin again.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1755
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1756
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1757
                answer := self checkinTroubleDialog:'Version conflict'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1758
                     message:msg 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1759
                     log:changesAsLogged
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1760
                     abortable:false
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1761
                     option:'show conflicts'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1762
                     option2:'resolve conflicts'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1763
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1764
                answer == #option ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1765
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1766
                    "/ show conflicts in a 3-way DiffTextView ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1767
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1768
                    Diff3TextView
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1769
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1770
                        label:'your version (checkin attempt)' 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1771
                        label:'original (base version)' 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1772
                        label:'newest repository version'. 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1773
                ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1774
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1775
                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1776
                answer == #option2 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1777
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1778
                    "/ allow checkin of repair version
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1779
                    "/ this is error prone ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1780
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1781
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1782
                    "/ show merged version in an editor ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1783
                    "/ ... accept will check it in.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1784
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1785
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1786
                    emSep := (Array with:(#color->Color black)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1787
                                 with:(#backgroundColor->Color green)).
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1788
                    emphasizedText := Diff3TextView 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1789
                                emphasizeMergedDiff3Text:emphasizedText 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1790
                                emphasize1:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1791
                                                  with:(#backgroundColor->Color blue))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1792
                                emphasize2:(Array with:(#color->Color white)
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1793
                                                  with:(#backgroundColor->Color red))
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1794
                                emphasizeSep:emSep.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1795
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1796
                    comment := 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1797
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1798
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1799
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1800
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1801
"/ Each such conflict is surrounded by green text (like this paragraph).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1802
"/ 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1803
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1804
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1805
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1806
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1807
'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1808
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1809
                    emphasizedText := comment , emphasizedText.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1810
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1811
                    didAccept := false. checkInRepaired := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1812
                    [didAccept not and:[checkInRepaired]] whileTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1813
                        editor := RCSConflictEditTextView 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1814
                                    setupWith:emphasizedText
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1815
                                    title:'Resolve conflicts in ' , containerFilename , ', then accept & close to checkin'.    
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1816
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1817
                        editor acceptAction:[:dummy |
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1818
                            repairedText := editor list.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1819
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1820
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1821
                        didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1822
                        editor topView openModal.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1823
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1824
                        didAccept ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1825
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1826
                            ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1827
                                checkInRepaired := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1828
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1829
                        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1830
                            "/ check if all green-stuff (separators) have been removed
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1831
                            (repairedText findFirst:[:line | line notNil and:[line notEmpty and:[(line emphasisAt:1) = emSep]]]) ~~ 0 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1832
                                self warn:'You have to look at ALL conflicts, and remove ALL green lines as a confirmation !!'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1833
                                didAccept := false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1834
                            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1835
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1836
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1837
                    ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1838
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1839
                    checkInRepaired ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1840
                        [
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1841
                            out := (tempdir construct:checkoutName) writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1842
                            out nextPutAll:(repairedText asString string).
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1843
                            didAccept := true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1844
                            out close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1845
                        ] on:FileStream openErrorSignal do:[:ex|
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1846
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1847
                            checkInRepaired := false.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1848
                        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1849
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1850
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1851
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1852
                checkInRepaired ifTrue:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1853
                    Transcript showCR:'checking in ' , containerFilename , ' (manually repaired version) ...'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1854
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1855
                    'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1856
                    Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1857
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1858
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1859
            ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1860
                (whatHappened startsWith:'U ') ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1861
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1862
                    "/ nothing changed here, but the repository already contains
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1863
                    "/ a newer version.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1864
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1865
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1866
                    self information:'nothing changed in your ''' , containerFilename , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1867
but repository already contains a newer version (repository unchanged).'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1868
                    ^ true.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1869
                ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1870
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1871
                    "/ unexpected
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1872
                    "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1873
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1874
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1875
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1876
No checkin performed.'.
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1877
                    Transcript showCR:'*** cannot checkin ' , containerFilename , ' (unexpected CVS response; repository unchanged)'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1878
                    ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1879
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1880
            ]
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1881
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1882
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1883
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1884
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1885
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1886
        "/
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1887
        self activityNotification:'saving ' , containerFilename , ' in repository...'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1888
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1889
        logMsg := logMsg replChar:$"  withString:'\"'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1890
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1891
        OperatingSystem isUNIXlike ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1892
            "/ save the log message into another tempFile ...
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1893
            logTmp := Filename newTemporaryIn:tempdir.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1894
            s := logTmp writeStream.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1895
            s nextPutAll:logMsg.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1896
            s close.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1897
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1898
            cmd := 'commit -F "%1" %2 %3 > "%4"'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1899
                    bindWith:logTmp baseName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1900
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1901
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1902
                    with:cmdOut name.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1903
        ] ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1904
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1905
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1906
            "/ CVS V1.9.16 to stdout.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1907
            "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1908
            cmd := 'commit -m "%1" %2 %3 > "%4" 2>&1'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1909
                    bindWith:logMsg
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1910
                    with:CVSCommitOptions
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1911
                    with:checkoutName
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1912
                    with:cmdOut name
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1913
        ].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1914
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1915
        (self 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1916
            executeCVSCommand:cmd 
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1917
            module:moduleDir
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1918
            inDirectory:tempdir name
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1919
        ) ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1920
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1921
                whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1922
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1923
                whatHappened := '<< no message >>'
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1924
            ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1925
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1926
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1927
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1928
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1929
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1930
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1931
           ('CVSSourceCodeManager [error]: cvs: ' , whatHappened) errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1932
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1933
            logTmp notNil ifTrue:[logTmp remove].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1934
            ^ false.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1935
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1936
        logTmp notNil ifTrue:[logTmp remove].
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1937
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1938
            whatHappened := cmdOut contentsOfEntireFile asString.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1939
        ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1940
            whatHappened := nil
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1941
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1942
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1943
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1944
        "/ fetch the new revision nr as found in the commit commands output
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1945
        "/
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1946
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1947
        (whatHappened isEmptyOrNil) ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1948
            'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1949
        ] ifFalse:[
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1950
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1951
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1952
            idx == 0 ifTrue:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1953
                'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1954
            ] ifFalse:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1955
                l := whatHappened at:idx.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1956
                newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1957
            ]
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1958
        ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1959
    ] ensure:[
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1960
        cmdOut notNil ifTrue:[ cmdOut remove ].
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  1961
        tempdir notNil ifTrue:[ tempdir recursiveRemove ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1962
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1963
    ^ true
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  1964
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  1965
    "Modified: / 12-11-2010 / 11:04:10 / cg"
2823
70f154c6ee66 changed: #checkin:text:directory:module:logMessage:force:
sr
parents: 2822
diff changeset
  1966
    "Modified: / 19-04-2012 / 14:18:24 / sr"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1967
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1968
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1969
checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMessage force:forceArg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1970
    "enter a classes source code (which has been already filed out into sourceFileName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1971
     into the source repository. If the force argument is true, no merge is done;
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1972
     instead, the code is checked in as given (Dangerous).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1973
     Return true if ok, false if not."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1974
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  1975
    |tempdir cmd checkoutName logMsg revision newestRevision logTmp 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1976
     cmdOut whatHappened s entry idx changeLog changesAsLogged l 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1977
     newRevision newString binRevision className msg answer didMerge
1408
762e5320c296 oops - could checkIn nil-sourcecode (in force)
ca
parents: 1407
diff changeset
  1978
     modulePath time 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1979
     editor checkInRepaired checkInNew didAccept emphasizedText repairedText out 
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  1980
     emSep comment force conflictResolvedManually|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1981
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1982
    force := forceArg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1983
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1984
    className := cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1985
    cls isPrivate ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  1986
        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
  1987
        ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1988
    ].
2540
d62a6c2c7d02 changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2511
diff changeset
  1989
    revision := "cls revision" cls revisionOfManager:self.        
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  1990
    (revision notNil and:[revision endsWith:$m]) 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1991
    ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1992
        "/ this class has already been checked in with a merge,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1993
        "/ but not reloaded from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1994
        "/ must use the original revision string.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  1995
        revision := revision copyButLast:1.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1996
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1997
    (binRevision := cls binaryRevision) notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1998
        revision ~= binRevision ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  1999
            ('CVSSourceCodeManager [info]: class ' , className , ' is based upon ' , binRevision , ' but has revision ' , (revision ? '?')) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2000
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2001
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2002
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2003
    revision isNil ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2004
        revision := newestRevision := self newestRevisionOf:cls.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2005
        revision isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2006
            force ifTrue:[
1730
0dc7ef515414 support multiple managers
Claus Gittinger <cg@exept.de>
parents: 1664
diff changeset
  2007
                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
  2008
                revision isNil ifTrue:[
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  2009
                    revision := '1.0'   "/ initial checkin
6e9312011620 handle exception when newestRevisionInFile:classFileName directory:packageDir module:moduleDir isNil
fm
parents: 1899
diff changeset
  2010
                ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2011
            ] ifFalse:[
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2012
                revision := '1.0'   "/ initial checkin
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2013
            ]
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2014
        ] ifFalse:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2015
            revision == #deleted ifTrue:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2016
                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
  2017
            ].
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2018
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2019
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2020
1373
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2021
    logMessage isNil ifTrue:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2022
        logMsg := ''.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2023
    ] ifFalse:[
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2024
        logMsg := logMessage asSingleByteStringIfPossible.
2982
2eb45cee793d class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2947
diff changeset
  2025
        logMsg isWideString ifTrue:[
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2026
            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
  2027
            ^ false.
65473183582d Check for unicode in cvs log message (cvs cannot handle this)
Stefan Vogel <sv@exept.de>
parents: 1365
diff changeset
  2028
        ].    
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2029
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2030
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2031
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2032
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2033
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2034
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2035
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2036
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2037
    "/ in CVS, we have to checkout the file first, in order
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2038
    "/ to get up-to-date CVS entries, and also to be able to merge in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2039
    "/ other users changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2040
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2041
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2042
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2043
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2044
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2045
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2046
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2047
        ('no tempDir - cannot checkin ' , className) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2048
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2049
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2050
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2051
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2052
        "/ next, create CVS/Entries and CVS/Repository with version information of current version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2053
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2054
        modulePath :=  moduleDir , '/' , packageDir. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2055
        checkoutName :=  modulePath , '/' , classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2056
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2057
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2058
        "/ correct our current time, so that converting it will give us UTC
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2059
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2060
        time := Timestamp now asUtcTimestamp subtractSeconds:1.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2061
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2062
        self createEntryFor:checkoutName 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2063
             module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2064
             in:(tempdir construct:modulePath) 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2065
             revision:revision
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2066
             date:(self cvsTimeString:time)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2067
             special:''
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2068
             overwrite:true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2069
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2070
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2071
        "/ copy-over our current version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2072
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2073
        Error handle:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2074
            self reportError:'cannot copy-over filedOut class source'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2075
            ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2076
        ] do:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2077
            sourceFileName asFilename copyTo:(tempdir construct:checkoutName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2078
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2079
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2080
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2081
        "/ synchronize i.e. merge in any changes
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2082
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2083
        self activityNotification:'merging ' , cls name , ' with repository version...'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2084
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2085
        cmd := 'update %1 %2 >"%3"'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2086
            bindWith:CVSUpdateOptions
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2087
            with:classFileName
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2088
            with:cmdOut name.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2089
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2090
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2091
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2092
            module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2093
            inDirectory:((tempdir construct:moduleDir) constructString:packageDir)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2094
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2095
            force ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2096
                (self checkForExistingContainer:classFileName inModule:moduleDir directory:packageDir) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2097
                    "/ no container
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2098
                    "/ someone fiddled around with repository ?
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2099
                    (cls binaryRevision notNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2100
                        (Dialog confirm:('Someone seems to have removed the source container for ',cls name,'\\Force new checkin ?') withCRs)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2101
                        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2102
                            cls setBinaryRevision:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2103
                            ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir source:sourceFileName logMessage:logMsg force:force.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2104
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2105
                    ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2106
                    (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,\or the CVS server is unreachable).\\Proceed?' bindWith:cls name allBold) withCRs)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2107
                    ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2108
                        ^ false
1813
de32cd2fc62f care for non-present cvs module.
Michael Beyl <mb@exept.de>
parents: 1812
diff changeset
  2109
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2110
                ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2111
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2112
                "/ is the version correct ?
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2113
                newestRevision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2114
                    newestRevision := self newestRevisionOf:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2115
                    newestRevision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2116
                        (Dialog confirm:('The source container for ',cls name allBold,' seems corrupted. Proceed?' withCRs)) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2117
                            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2118
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2119
                        ^ self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2120
                            checkinClass:cls fileName:classFileName directory:packageDir module:moduleDir 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2121
                            source:sourceFileName logMessage:logMessage force:true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2122
                    ].
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  2123
                ].
2483
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2124
"/            revision > newestRevision ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2125
"/                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
  2126
"/                ifTrue:[
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2127
"/                    "/ newVersionString := self updatedRevisionStringOf:cls forRevision:newestRevision with:cls revisionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2128
"/                    "/ self updateVersionMethodOf:cls for:newVersionString.
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2129
"/                    ^ 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
  2130
"/                ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2131
"/            ].
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2132
"/
d4c6fea949e0 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2482
diff changeset
  2133
"/            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
  2134
"/            ^ false.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2135
                "/ if we arrive here, proceed as if merged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2136
                whatHappened := 'M initial'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2137
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2138
        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2139
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2140
            "/ check what happened - the contents of the cmdOut file may be:
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2141
            "/   empty   -> nothing changed
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2142
            "/   M xxx   -> merged-in changes from other users
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2143
            "/   C xxx   -> a conflict occured and the differences have been merged into the source
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2144
            "/              needs special action
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2145
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2146
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2147
                whatHappened := cmdOut contentsOfEntireFile asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2148
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2149
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2150
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2151
        (whatHappened isEmptyOrNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2152
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2153
            "/ no change
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2154
            "/
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2155
"/        Transcript showCR:'no change in ' , className , ' (repository unchanged)'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2156
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2157
            force ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2158
"/            (ChangeSet current includesChangeForClass:cls) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2159
"/                (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
  2160
"/                    ChangeSet current condenseChangesForClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2161
"/                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2162
"/            ] ifFalse:[
1425
c02c03705574 be less chatty.
Claus Gittinger <cg@exept.de>
parents: 1424
diff changeset
  2163
"/                self information:('Nothing changed in %1 (repository unchanged)' bindWith:className).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2164
"/            ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2165
                self postCheckInClass:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2166
            ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2167
                changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2168
                (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2169
                    'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2170
                    self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
2540
d62a6c2c7d02 changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2511
diff changeset
  2171
                ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2172
                    entry := (changeLog at:#revisions) first.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2173
                    newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2174
                    self updateVersionMethodOf:cls for:newString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2175
                    cls revision ~= newRevision ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2176
                        'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2177
                    ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2178
                        ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2179
                    ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2180
                ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2181
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2182
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2183
            ^ true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2184
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2185
        Verbose == true ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2186
            ('CVSMGR: result is: ' , whatHappened) infoPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2187
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2188
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2189
        force ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2190
            revision isNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2191
                changeLog := self revisionLogOf:cls.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2192
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2193
                changeLog := self revisionLogOf:cls fromRevision:(self revisionAfter:revision) toRevision:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2194
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2195
            changeLog notNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2196
                s := WriteStream on:String new.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2197
                self writeRevisionLogMessagesFrom:changeLog withHeader:false to:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2198
                changesAsLogged := s contents.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2199
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2200
                "/ mhmh - that should not happen
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2201
                changesAsLogged := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2202
            ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2203
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2204
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2205
        didMerge := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2206
        conflictResolvedManually := checkInRepaired := checkInNew := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2207
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2208
        "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2209
        "/ cvs above rel10 returns a multiline info ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2210
        "/ we have to extract the one line which states what happened.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2211
        "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2212
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2213
        whatHappened := whatHappened select:[:line |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2214
                            (line startsWith:'RCS file') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2215
                            and:[(line startsWith:'retrieving') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2216
                            and:[(line startsWith:'Merging') not
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2217
                            and:[line size > 0]]]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2218
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2219
        whatHappened := whatHappened asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2220
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2221
        (force or:[(whatHappened startsWith:'M ') or:[whatHappened startsWith:'A ']]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2222
            "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2223
            "/ merged in changes / resurrected
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2224
            "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2225
            (force 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2226
            or:[changeLog isNil 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2227
            or:[(changeLog at:#revisions ifAbsent:nil) isEmptyOrNil]]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2228
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2229
                "/ pretty good - nothing has changed in the meanwhile
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2230
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2231
                Transcript showCR:('checking in %1 (%2)...' bindWith:className with:modulePath).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2232
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2233
                |mySource mergedSource |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2234
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2235
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2236
                "/ someone else has changed things in the meanwhile, but there is no conflict
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2237
                "/ and version have been merged.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2238
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2239
                didMerge := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2240
                changesAsLogged := changesAsLogged asCollectionOfLines.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2241
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2242
                s := WriteStream on:String new.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2243
                self fileOutSourceCodeOf: cls on:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2244
                mySource := s contents asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2245
                mergedSource := (tempdir construct:checkoutName) readStream contents asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2246
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2247
                mySource = mergedSource ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2248
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2249
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2250
I have merged your version with the newest repository version, 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2251
and found no differences between the result and your current version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2252
(i.e. your version seemed up-to-date).'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2253
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2254
                    self checkinTroubleDialog:'Merging versions'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2255
                                   message:msg 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2256
                                   log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2257
                                   abortable:false 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2258
                                   option:nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2259
                    didMerge := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2260
                ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2261
                    msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2262
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2263
If you continue, your new changes (based upon rev. ' , revision printString , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2264
into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2265
into a new common revision which may be different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2266
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
  2267
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2268
You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2269
most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2270
change methods as required and check in again. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2271
Be aware, that after that, the actual repository version is different from your current classes,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2272
and you should update your class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2273
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2274
Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2275
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2276
                    answer := self checkinTroubleDialog:'Merging versions'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2277
                                   message:msg 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2278
                                   log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2279
                                   abortable:true
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2280
                                   option:'Stop - see first'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2281
                                   option2:'Do NOT Merge - Force my Code'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2282
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2283
                    answer == #option2 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2284
                        (Dialog confirm:'Are you certain that you want to suppress a merge and force your code to be checked in ?')
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2285
                        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2286
                            s := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2287
                            self fileOutSourceCodeOf: cls on:s.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2288
                            s close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2289
                            answer := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2290
                        ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2291
                    ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2292
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2293
                    answer ~~ true ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2294
                        answer == #option ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2295
                            DiffCodeView
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2296
                                openOn:mySource
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2297
                                label:'current version'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2298
                                and:mergedSource
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2299
                                label:'merged version'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2300
                                
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2301
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2302
                        self reportError:'checkin aborted - (no merge; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2303
                        ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2304
                    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2305
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2306
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2307
"/                changesAsLogged := (changesAsLogged asStringCollection collect:[:line | line withTabsExpanded]) asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2308
"/                msg := 'The source of ' , className , ' has been changed in the meanwhile as follows:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2309
"/' , changesAsLogged , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2310
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2311
"/If you continue, your new changes (based upon rev. ' , revision , ') will be MERGED
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2312
"/into the newest revision. This will combine the other version with your changes
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2313
"/into a new common revision which is different from both. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2314
"/Although convenient, it may fail to create the expected result in certain situations. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2315
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2316
"/You should carefully check the result - by comparing the current version with the
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2317
"/most recent version in the repository. If that does not contain an acceptable version,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2318
"/change methods as required and check in again. Be aware, that the actual repository version
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2319
"/is different from your current classes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2320
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2321
"/Continue ?'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2322
"/                (self confirm:msg) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2323
"/                    Transcript showCR:'checkin aborted - (no merge; repository unchanged)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2324
"/                    ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2325
"/                ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2326
                Transcript showCR:('checking in %1 (%2) (merge)...' bindWith:className with:modulePath).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2327
            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2328
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2329
            (whatHappened startsWith:'C ') ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2330
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2331
                "/ conflict; someone else checked in something in the meanwhile,
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2332
                "/ and there is a conflict between this version and the checked in version.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2333
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2334
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2335
                changesAsLogged := changesAsLogged asCollectionOfLines.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2336
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2337
                msg := 'The source of ' , className , ' has been changed in the meanwhile as listed below.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2338
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2339
Your new changes (based upon rev. ' , revision printString , ') CONFLICT with those changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2340
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2341
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
  2342
and change your methods avoiding conflicts. Then checkin again.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2343
'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2344
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2345
                answer := self checkinTroubleDialog:'Version conflict'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2346
                     message:msg 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2347
                     log:changesAsLogged
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2348
                     abortable:false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2349
                     option:'Show conflicts'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2350
                     option2:'Resolve conflicts'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2351
                     option3:'Do NOT Merge - Force my Code'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2352
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2353
                answer == #option ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2354
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2355
                    "/ show conflicts in a 3-way DiffTextView ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2356
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2357
                    Diff3TextView
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2358
                        openOnMergedText:(tempdir construct:checkoutName) readStream contents 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2359
                        label:'your version (checkin attempt)' 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2360
                        label:'original (base version)' 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2361
                        label:'newest repository version'. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2362
                ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2363
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2364
                answer == #option2 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2365
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2366
                    "/ allow checkin of repair version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2367
                    "/ this is error prone ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2368
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2369
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2370
                    "/ show merged version in an editor ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2371
                    "/ ... accept will check it in.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2372
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2373
                    emphasizedText := (tempdir construct:checkoutName) readStream contents.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2374
                    emSep := (Array with:(#color->Color black)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2375
                                 with:(#backgroundColor->Color green)).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2376
                    emphasizedText := Diff3TextView 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2377
                                emphasizeMergedDiff3Text:emphasizedText 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2378
                                emphasize1:(Array with:(#color->Color white)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2379
                                                  with:(#backgroundColor->Color blue))
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2380
                                emphasize2:(Array with:(#color->Color white)
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2381
                                                  with:(#backgroundColor->Color red))
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2382
                                emphasizeSep:emSep.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2383
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2384
                    comment := 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2385
'"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2386
"/ This text contains your current versions code (blue)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2387
"/ merged with the conflicting code as found in the repository (red) which resulted
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2388
"/ from some other checkin.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2389
"/ Each such conflict is surrounded by green text (like this paragraph).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2390
"/ 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2391
"/ Please have a look at ALL the conflicts and fix things as appropriate.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2392
"/ Delete the green lines as a confirmation - I will not checkin the changed text,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2393
"/ unless no more green parts are present. This includes this comment at the top.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2394
"/ ***************************************************************
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2395
'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2396
                    comment := (Text string:comment emphasis:emSep) asStringCollection.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2397
                    emphasizedText := comment , emphasizedText.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2398
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2399
                    didAccept := false. checkInRepaired := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2400
                    [didAccept not and:[checkInRepaired]] whileTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2401
                        editor := RCSConflictEditTextView 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2402
                                    setupWith:emphasizedText
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2403
                                    title:'Resolve conflicts in ' , className , ', then accept & close to checkin'.    
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2404
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2405
                        editor acceptAction:[:dummy |
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2406
                            repairedText := editor list.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2407
                            didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2408
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2409
                        didAccept := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2410
                        editor topView openModal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2411
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2412
                        didAccept ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2413
                            (Dialog confirm:'You did not accept the new text. Edit again ?')
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2414
                            ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2415
                                checkInRepaired := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2416
                            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2417
                        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2418
                            "/ check if all green-stuff (separators) have been removed
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2419
                            (repairedText findFirst:[:line | line notNil and:[line notEmpty and:[(line emphasisAt:1) = emSep]]]) ~~ 0 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2420
                                self warn:'You have to look at ALL conflicts, and remove ALL green lines as a confirmation !!'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2421
                                didAccept := false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2422
                            ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2423
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2424
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2425
                    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2426
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2427
                    checkInRepaired ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2428
                        [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2429
                            out := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2430
                            out nextPutAll:(repairedText asString string).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2431
                            didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2432
                            out close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2433
                        ] on:FileStream openErrorSignal do:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2434
                            self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2435
                            checkInRepaired := false.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2436
                        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2437
                    ]
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2438
                ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2439
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2440
                answer == #option3 ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2441
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2442
                    "/ force checkin of new version
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2443
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2444
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2445
                    "/ show merged version in an editor ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2446
                    "/ ... accept will check it in.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2447
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2448
                    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2449
                        out := (tempdir construct:checkoutName) writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2450
                        self fileOutSourceCodeOf: cls on:out.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2451
                        out close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2452
                        didAccept := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2453
                        checkInNew := checkInRepaired := true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2454
                    ] on:FileStream openErrorSignal do:[:ex|
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2455
                        self warn:'could not write file ' , (tempdir constructString:checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2456
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2457
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2458
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2459
                checkInRepaired ifTrue:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2460
                    checkInNew ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2461
                        Transcript showCR:('checking in %1 (%2) (force)...' bindWith:className with:modulePath).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2462
                    ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2463
                        conflictResolvedManually := true.    "/ checkInRepaired and:[checkInNew not].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2464
                        Transcript showCR:('checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2465
                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2466
                ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2467
                    Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2468
                    self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2469
                    ^ false.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2470
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2471
            ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2472
                ((whatHappened startsWith:'U ') 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2473
                or:[ (whatHappened startsWith:'P ') ]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2474
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2475
                    "/ nothing changed here, but the repository already contains
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2476
                    "/ a newer version.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2477
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2478
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2479
                    self information:'nothing changed in your ''' , className , ''';
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2480
but repository already contains a newer version (repository unchanged).'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2481
                    ^ true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2482
                ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2483
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2484
                    "/ unexpected
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2485
                    "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2486
                    self warn:'unexpected message from CVS:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2487
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2488
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2489
No checkin performed.'.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2490
                    self reportError:'*** cannot checkin ' , className , ' (unexpected CVS response; repository unchanged)'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2491
                    ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2492
                ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2493
            ]
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2494
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2495
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2496
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2497
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2498
        "/ now check it in again
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2499
        "/
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2500
        self activityNotification:'saving ' , cls name , ' in repository...'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2501
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2502
        logMsg := logMsg replChar:$"  withString:'\"'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2503
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2504
        OperatingSystem isUNIXlike ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2505
            "/ save the log message into another tempFile ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2506
            logTmp := Filename newTemporaryIn:tempdir.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2507
            s := logTmp writeStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2508
            s nextPutAll:logMsg.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2509
            s close.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2510
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2511
            cmd := 'commit -F "', logTmp baseName, '" ', checkoutName, ' >', '"' , cmdOut name , '"'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2512
        ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2513
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2514
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2515
            "/ CVS V1.9.16 to stdout.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2516
            "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2517
            cmd := 'commit -m "', logMsg, '" ', checkoutName, ' >', '"', cmdOut name, '"' , ' 2>&1'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2518
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2519
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2520
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2521
            module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2522
            inDirectory:tempdir name
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2523
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2524
            (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2525
                whatHappened := cmdOut contentsOfEntireFile asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2526
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2527
                whatHappened := '<< no message >>'
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2528
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2529
            self warn:'The following problem was reported by cvs:
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2530
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2531
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2532
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2533
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2534
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2535
            logTmp notNil ifTrue:[logTmp remove].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2536
            self reportError:'cannot checkin modified class source'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2537
            ^ false.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2538
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2539
        logTmp notNil ifTrue:[logTmp remove].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2540
        (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2541
            whatHappened := cmdOut contentsOfEntireFile asString.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2542
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2543
            whatHappened := nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2544
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2545
    ] ensure:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2546
        tempdir notNil ifTrue:[ tempdir recursiveRemove ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2547
        cmdOut notNil ifTrue:[ cmdOut remove ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2548
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2549
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2550
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2551
    "/ fetch the new revision nr as found in the commit commands output
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2552
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  2553
    (whatHappened isEmptyOrNil) ifTrue:[
3112
5ccec8607540 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3106
diff changeset
  2554
        'CVSSourceCodeManager [warning]: unexpected empty checkin command output' errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2555
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2556
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2557
        idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2558
        idx == 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2559
            'CVSSourceCodeManager [error]: unexpected checkin command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2560
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2561
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2562
            newRevision := (l copyFrom:14 to:(l indexOf:$; startingAt:14)-1) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2563
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2564
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2565
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2566
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2567
    "/ if there was no merge (i.e. the current version has been checked in unchanged):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2568
    "/   patch the classes revisionInfo (but keep binaryRevision unchanged) to the new revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2569
    "/   this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2570
    "/   the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2571
    "/   (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
  2572
    "/    correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2573
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2574
    "/ 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
  2575
    "/ other version):
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2576
    "/    patch the classes revisionInfo (again, keep the binaryRevision) to the old revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2577
    "/    and add a 'm' (for merged).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2578
    "/    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
  2579
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2580
    newRevision notNil ifTrue:[
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2581
        (didMerge or:[conflictResolvedManually]) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2582
            self activityNotification:'fetch new revision number of ', cls name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2583
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2584
            changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2585
            (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2586
                force ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2587
                    changeLog := self revisionLogOfContainer:classFileName directory:packageDir module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2588
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2589
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2590
            (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2591
                'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  2592
                self updateVersionMethodOf:cls for:'$' , 'Header' , '$'.  "/ concatenated to avoid RCS expansion
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2593
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2594
                entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2595
                newString := self revisionStringFromLog:changeLog entry:entry forClass:cls.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  2596
                self updateVersionMethodOf:cls for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2597
                cls revision ~= newRevision ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2598
                    'CVSSourceCodeManager [error]: failed to update revisionString' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2599
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2600
            ]
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2601
        ] ifTrue:[      
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2602
            "/ 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
  2603
            "/ (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
  2604
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2605
            "/ 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
  2606
            didMerge ifTrue: [
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2607
                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
  2608
                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
  2609
            ]
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2610
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2611
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2612
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2613
    Class addChangeRecordForClassCheckIn:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2614
    self postCheckInClass:cls.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2615
2239
2ae6a8ef3b36 do NOT update version method when a conflict is resolved manually
fm
parents: 2230
diff changeset
  2616
    conflictResolvedManually ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2617
        self information:'Now the repository contains a merge between your and the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2618
However, the class in your image does NOT contain the other changes.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2619
This will lead to more conflict-resolving whenever you check this class in again later,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2620
unless you load the newest (merged) version of the class from the repository.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2621
2604
e0743b3ba275 message text only
Claus Gittinger <cg@exept.de>
parents: 2601
diff changeset
  2622
I recommend doing this as soon as possible via your browser''s checkout function.'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2623
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2624
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2625
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2626
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2627
     SourceCodeManager checkinClass:Array logMessage:'testing only'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2628
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2629
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2630
    "Created: / 11-09-1996 / 16:16:11 / cg"
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2631
    "Modified: / 26-02-1998 / 17:34:16 / stefan"
2909
ce68ca20000f changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2899
diff changeset
  2632
    "Modified: / 11-09-2012 / 18:43:38 / cg"
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2633
!
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  2634
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2635
checkoutModule:aModule directory:aPackage andDo:aBlock
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2636
    "check out everything from a package into a temporary directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2637
     Then evaluate aBlock, passing the name of that temp-directory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2638
     Afterwards, the tempDir is removed.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2639
     Return true, if OK, false if any error occurred."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2640
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  2641
    |cvsRoot packageDir tempdir cmdOut cmd dirName rslt|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2642
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2643
    cvsRoot := self getCVSROOTForModule:aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2644
    cvsRoot isNil ifTrue:[^ false ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2645
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2646
    aPackage notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2647
        dirName := aModule , '/' , aPackage.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2648
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2649
        dirName := aModule.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2650
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2651
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  2652
    self activityNotification:'Checking out everything in ' , dirName , '...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2653
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2654
    tempdir := self createTempDirectory:nil forModule:nil.
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2655
    [
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2656
        cmd := 'checkout ', dirName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2657
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2658
            "/ can redirect output
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2659
            cmdOut := Filename newTemporary.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2660
            cmdOut exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2661
                cmdOut remove.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2662
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2663
            cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2664
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2665
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2666
        rslt := self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2667
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2668
            module:aModule
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2669
            inDirectory:tempdir name.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2670
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2671
        packageDir := (tempdir construct:dirName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2672
        (packageDir exists and:[packageDir isDirectory]) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2673
            self reportError:(rslt ifTrue:['checkout failed (no dir)'] ifFalse:['failed to execute: ',cmd]).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2674
            ^ false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2675
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2676
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2677
        "/ now, invoke the block ...
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2678
        aBlock value:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2679
    ] ensure:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2680
        cmdOut notNil ifTrue:[ cmdOut remove ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2681
        tempdir notNil ifTrue:[ tempdir recursiveRemove ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2682
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2683
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2684
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  2685
    "Created: / 23-08-2006 / 14:07:05 / cg"
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  2686
    "Modified: / 06-03-2012 / 11:57:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2687
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2688
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2689
streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheItArg
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2690
    "extract a source file and return an open readStream on it,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2691
     or nil if the extract failed. If revision is nil or (#newest), take
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2692
     the latest; otherwise, a specific revisions source is extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2693
     The cls argument is currently ignored, but may be used in future versions,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2694
     to validate the correct container against the class.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2695
     To check out a file (i.e. not a classes file), leave it nil."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2696
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2697
    |cacheDir cacheSubDir cachedSourceFilename cachedFile cmd fullName revisionArg stream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2698
     checkoutName checkoutNameLocal fullTempName fullCachedName tempdir cmdOut
1405
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2699
     classFileName cvsRoot tempFile revMsg cacheIt|
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2700
cd6a25ddc6fe *** empty log message ***
penk
parents: 1393
diff changeset
  2701
    cacheIt := cacheItArg.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2702
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2703
    (DisabledModules notNil and:[DisabledModules includes:moduleDir]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2704
        Transcript showCR:'cvs access for module ' , moduleDir , ' has been disabled (due to previous failure)'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2705
        Transcript showCR:'reenable using the launchers source&debugger dialog'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2706
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2707
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2708
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2709
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2710
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2711
    cvsRoot isNil ifTrue:[^ nil].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2712
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2713
    classFileName := fileName.
1862
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2714
    classFileName isNil ifTrue:[classFileName := cls classBaseFilename].
c3370d61037d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1861
diff changeset
  2715
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2716
    (classFileName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2717
        classFileName := classFileName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2718
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2719
    (classFileName endsWith:'.st') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2720
        cls notNil ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2721
            classFileName := classFileName copyButLast:3.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2722
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2723
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2724
    fullName := moduleDir , '/' , packageDir , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2725
    cls notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2726
        fullName := fullName , '.st'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2727
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2728
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2729
    (revision isNil or:[revision == #newest]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2730
        cachedSourceFilename := classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2731
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2732
        cachedSourceFilename := classFileName , '_' , revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2733
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2734
2739
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2735
    "/ if not already existing, create a cache directory
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2736
    "/ where we deposit sources.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2737
    "/ this is used as a cache for further requests, since
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2738
    "/ accessing the repository may be slow.
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2739
    "/ (if cvs uses a remote connection via ppp, for example)
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2740
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2741
   (cacheIt and:[revision ~~ #newest and:[revision notNil]]) ifTrue:[
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2742
        (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
2740
a034603fd812 changed:
Claus Gittinger <cg@exept.de>
parents: 2739
diff changeset
  2743
            ('CVSSourceCodeManager [warning]: no source cache directory for %1' bindWith:cachedSourceFilename) infoPrintCR.
2739
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2744
        ]
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2745
    ].
ec6ef52ebb5d changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2738
diff changeset
  2746
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2747
    cacheDir notNil ifTrue:[
2230
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2748
        cacheSubDir := cacheDir / moduleDir / packageDir.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2749
        cachedFile := cacheSubDir / cachedSourceFilename.
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2750
        cachedFile exists ifTrue:[
356226c41514 changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2211
diff changeset
  2751
            ^ cachedFile readStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2752
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2753
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2754
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2755
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2756
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2757
    "/ 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
  2758
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2759
    tempdir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2760
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2761
        ('CVSSourceCodeManager [error]: no tempDir - cannot checkout ' , classFileName) errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2762
        ^ nil
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  2763
    ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2764
    [
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2765
"/    tempdir := Filename newTemporaryIn:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2766
"/    tempdir exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2767
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2768
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2769
"/    tempdir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2770
"/    dir := tempdir construct:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2771
"/    dir makeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2772
"/    dir := dir construct:packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2773
"/    dir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2774
"/    dir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2775
"/        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2776
"/        'CVSMGR: cannot create temporary directory' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2777
"/        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2778
"/    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2779
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2780
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2781
        "/ check it out there
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2782
        "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2783
        checkoutName :=  fullName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2784
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2785
        checkoutNameLocal := (moduleDir asFilename construct:packageDir) constructString:(fullName asFilename baseName).
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2786
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2787
        (revision isNil or:[revision == #newest]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2788
            cachedSourceFilename := classFileName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2789
            revisionArg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2790
            revMsg := ''.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2791
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2792
            cachedSourceFilename := classFileName , '_' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2793
            revisionArg := ' -r ' , revision.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2794
            revMsg := ' (' , revision , ')'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2795
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2796
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2797
        self activityNotification:'Checking out source ' , checkoutName , revMsg.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2798
        OperatingSystem isUNIXlike ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2799
            "/ can redirect output
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2800
            cmdOut := Filename newTemporary.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2801
            cmdOut exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2802
                cmdOut remove.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2803
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2804
            cmd := 'checkout' , revisionArg , ' ', checkoutName , ' > ' , '"' , cmdOut name, '"' .
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2805
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2806
            cmd := 'checkout' , revisionArg , ' ', checkoutName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2807
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2808
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2809
        (self 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2810
            executeCVSCommand:cmd 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2811
            module:moduleDir
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2812
            inDirectory:tempdir name
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2813
        ) ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2814
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
1477
bea2ad3479eb no longer automatically disable a CVS module !
Claus Gittinger <cg@exept.de>
parents: 1465
diff changeset
  2815
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2816
"/        "/ 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
  2817
"/        (self checkForExistingModule:moduleDir) ifFalse:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2818
"/            "/ disable
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2819
"/            DisabledModules isNil ifTrue:[
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2820
"/                DisabledModules := Set new.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2821
"/            ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2822
"/            DisabledModules add:moduleDir.
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2823
"/            ('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
  2824
"/        ].
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2825
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2826
            ^ nil.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2827
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2828
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2829
        fullTempName := tempdir construct:checkoutNameLocal.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2830
        (cacheSubDir isNil) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2831
            cacheIt := false
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2832
        ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2833
            cacheSubDir recursiveMakeDirectory.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2834
            fullCachedName := cacheSubDir constructString:cachedSourceFilename.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2835
        ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2836
        fullTempName exists ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2837
            ('CVSSourceCodeManager [error]: failed to checkout ', fullTempName pathName, ' (file does not exist after cvs co)') errorPrintCR.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2838
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2839
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2840
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2841
        (cacheIt 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2842
        and:[cachedFile notNil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2843
        and:[fullTempName exists]])
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2844
        ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2845
            (OsError catch:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2846
                fullTempName moveTo:fullCachedName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2847
                self activityNotification:'Cached as ',fullCachedName asFilename baseName.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2848
            ]) ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2849
                self activityNotification:'Not cached.'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2850
                ('CVSSourceCodeManager [error]: failed to rename ', fullTempName pathName, ' to ', cachedSourceFilename) errorPrintCR.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2851
                ^ nil
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2852
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2853
            fullCachedName asFilename exists ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2854
                stream := fullCachedName asFilename readStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2855
            ].
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  2856
        ] ifFalse:[
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2857
            fileName = 'extensions.st' ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2858
                self activityNotification:'Not cached - please check your settings and/or the version method in the projectDefinition.'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2859
            ] ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2860
                self activityNotification:'Not cached - please check your settings.'.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2861
            ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2862
            OperatingSystem isUNIXlike ifFalse:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2863
                "/ cannot remove files which are still open ...
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2864
                "/ sigh - need a delete-on-close flag in FileStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2865
                "/
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2866
                tempFile := Filename newTemporary.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2867
                fullTempName copyTo:tempFile.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2868
                stream := tempFile readStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2869
                stream notNil ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2870
                    stream removeOnClose:true.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2871
                ].
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2872
            ] ifTrue:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2873
                stream := fullTempName readStream.
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2874
            ]
2511
6bd0081d93bb changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2508
diff changeset
  2875
        ].
3265
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2876
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2877
    ] ensure:[
30ddf37438d8 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3264
diff changeset
  2878
        cmdOut notNil ifTrue:[cmdOut remove].
3274
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  2879
        tempdir notNil ifTrue:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  2880
            OsError handle:[:ex |
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  2881
                ('CVSSourceCodeManager [warning]: could not remove temp directory ',tempdir pathName) infoPrintCR.
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  2882
            ] do:[
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  2883
                tempdir recursiveRemove
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  2884
            ]
0b7cfdcb4b14 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3267
diff changeset
  2885
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2886
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2887
    ^ stream
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2888
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  2889
    "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
  2890
    "Modified: / 20-08-1997 / 16:37:11 / stefan"
2741
3914394ee4dd changed: #streamForClass:fileName:revision:directory:module:cache:
Claus Gittinger <cg@exept.de>
parents: 2740
diff changeset
  2891
    "Modified: / 20-01-2012 / 16:43:37 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2892
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2893
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2894
!CVSSourceCodeManager class methodsFor:'source code administration'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2895
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2896
checkForExistingContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2897
    "check for a container to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2898
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2899
    |fullName ret ret2 cvsRoot cmd tempDir outputStream errorStream isLocalCVSRoot|
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2900
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2901
    cvsRoot := self getCVSROOTForModule:moduleDir.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2902
    cvsRoot isNil ifTrue:[^ false].
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2903
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2904
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2905
        cvsRoot := cvsRoot withoutPrefix:':local:'.
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2906
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2907
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2908
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2909
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2910
    (RemoteCVS not or:[isLocalCVSRoot]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2911
        cvsRoot asFilename exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2912
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2913
            "/ with local CVS - simply check if that file exists
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2914
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2915
            (fullName endsWith:',v') ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2916
                fullName := fullName , ',v'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2917
            ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2918
            ^ (cvsRoot asFilename / fullName) exists.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2919
        ].
3263
fb60d533ee9c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3260
diff changeset
  2920
        ^ false
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2921
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2922
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2923
    tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2924
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2925
    "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2926
     need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2927
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2928
    (fullName endsWith:',v') ifTrue:[
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  2929
        fullName := fullName copyButLast:2.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2930
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2931
1488
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  2932
    "/ 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
  2933
    "/ (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
  2934
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  2935
    "/ cmd := '-n rtag -l -F dummy '.
52af296c5910 rtag again - getting mad at CVS !!!!
Claus Gittinger <cg@exept.de>
parents: 1485
diff changeset
  2936
    cmd := '-n rtag -F dummy '.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2937
    [  
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2938
        errorStream := '' writeStream.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2939
        outputStream := '' writeStream.
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2940
        
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2941
        ret := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2942
                    executeCVSCommand:cmd , fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2943
                    module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2944
                    "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2945
                    "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2946
                    "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2947
                    inDirectory:(tempDir pathName) 
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2948
                    log:false
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2949
                    outputTo:outputStream
1390
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2950
                    errorTo:errorStream.
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2951
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2952
        "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
  2953
         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
  2954
5ca713ed160e Fix for cvs 1.11.6 and following
Stefan Vogel <sv@exept.de>
parents: 1388
diff changeset
  2955
        "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
  2956
        "/ cg: read comment above.
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2957
        ret2 := errorStream size == 0.
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2958
        ret2 ifFalse:[
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2959
            ret2 := (errorStream contents asCollectionOfLines 
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2960
                        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
  2961
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2962
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2963
        tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2964
    ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2965
    ^ ret2
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2966
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2967
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2968
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2969
        checkForExistingContainer:'Integer.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2970
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2971
        directory:'libbasic' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2972
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2973
     CVSSourceCodeManager 
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2974
        checkForExistingContainer:'AboutBox.st'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2975
        inModule:'stx' 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2976
        directory:'libtool' 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2977
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2978
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  2979
    "Modified: / 23-07-1999 / 17:36:58 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  2980
    "Created: / 13-09-2006 / 18:20:36 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2981
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2982
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2983
checkForExistingModule:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2984
    "check for a module to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2985
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2986
    |ret cvsRoot cmd tempDir isLocalCVSRoot |
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2987
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2988
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2989
        (RecentlyCheckedModulesAndPackages includes:moduleDir) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2990
            RecentlyCheckedModulesAndPackages remove:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2991
            RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2992
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2993
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  2994
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2995
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2996
    self activityNotification:'checking for existing module ' , moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2997
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2998
    cvsRoot := self getCVSROOTForModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  2999
    cvsRoot isNil ifTrue:[^ false].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3000
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3001
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3002
        cvsRoot := cvsRoot withoutPrefix:':local:'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3003
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3004
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3005
    ((RemoteCVS not or:[isLocalCVSRoot])
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3006
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3007
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3008
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3009
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3010
        ret := (cvsRoot , '/' , moduleDir) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3011
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3012
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3013
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3014
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3015
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3016
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3017
        cmd := '-n rtag -l dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3018
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3019
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3020
                        executeCVSCommand:cmd , moduleDir 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3021
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3022
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3023
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3024
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3025
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3026
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3027
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3028
            tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3029
        ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3030
    ].
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3031
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3032
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3033
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3034
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3035
    RecentlyCheckedModulesAndPackages addFirst:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3036
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3037
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3038
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3039
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3040
     CVSSourceCodeManager checkForExistingModule:'stx'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3041
     CVSSourceCodeManager checkForExistingModule:'DPU'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3042
     CVSSourceCodeManager checkForExistingModule:'cg'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3043
     CVSSourceCodeManager checkForExistingModule:'aeg' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3044
     CVSSourceCodeManager checkForExistingModule:'foo'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3045
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3046
1832
e47ad13133b8 error reporting (in checkModule) was uninformative when login was required
Claus Gittinger <cg@exept.de>
parents: 1829
diff changeset
  3047
    "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
  3048
    "Modified: / 23-07-1999 / 17:38:59 / stefan"
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3049
    "Modified: / 19-08-2011 / 10:38:35 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3050
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3051
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3052
checkForExistingModule:moduleDir directory:directory
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3053
    "check for a package to exist"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3054
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3055
    |ret cvsRoot cmd tempDir fullName isLocalCVSRoot|
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3056
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3057
    fullName := moduleDir , '/' , directory.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3058
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3059
    RecentlyCheckedModulesAndPackages notNil ifTrue:[
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3060
        (RecentlyCheckedModulesAndPackages includes:fullName) ifTrue:[
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3061
            RecentlyCheckedModulesAndPackages remove:fullName.
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3062
            RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3063
            ^ true.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3064
        ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3065
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3066
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3067
    self activityNotification:'checking for existing package ' , directory.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3068
1365
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3069
    cvsRoot := self getCVSROOTForModule:moduleDir.
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3070
    cvsRoot isNil ifTrue:[^ false].
ad41e246bd9d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1362
diff changeset
  3071
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3072
    (isLocalCVSRoot := (cvsRoot startsWith:':local:')) ifTrue:[
3260
5b3469abfc4f refactored
Claus Gittinger <cg@exept.de>
parents: 3235
diff changeset
  3073
        cvsRoot := cvsRoot withoutPrefix:':local:'.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3074
    ].
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3075
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3076
    ((RemoteCVS not or:[isLocalCVSRoot]) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3077
    and:[ cvsRoot asFilename exists ]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3078
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3079
        "/ with local CVS - simply check if that directory exists
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3080
        "/
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3081
        ret := (cvsRoot , '/' , fullName) asFilename isDirectory.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3082
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3083
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3084
        tempDir := self createTempDirectory:nil forModule:nil.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3085
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3086
        "With remote CVS, do a no-op rtag command, which doesn't
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3087
         need a working directory, but reports missing files"
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3088
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3089
        cmd := '-n rtag -l -F dummy '.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3090
        [
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3091
            ret := self 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3092
                        executeCVSCommand:cmd, fullName 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3093
                        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3094
                        "/ cg; cannot do it in current dir, in case it contains a CVS subDirectory,
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3095
                        "/ with a different CVSRoot in its CVS/Root file ...
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3096
                        "/ cvs would complain then.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3097
                        inDirectory:(tempDir pathName) 
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3098
                        log:false.
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3099
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3100
        ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3101
            tempDir recursiveRemove.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3102
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3103
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3104
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3105
    RecentlyCheckedModulesAndPackages isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3106
        RecentlyCheckedModulesAndPackages := OrderedCollection new.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3107
    ].
2506
1a4f8dd6c1d6 added: #cvsCommandTimeout
Claus Gittinger <cg@exept.de>
parents: 2486
diff changeset
  3108
    RecentlyCheckedModulesAndPackages addFirst:fullName.
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  3109
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3110
    ^ ret
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3111
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3112
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3113
     CVSSourceCodeManager checkForExistingModule:'stx' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3114
     CVSSourceCodeManager checkForExistingModule:'aeg' package:'libProgram'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3115
     CVSSourceCodeManager checkForExistingModule:'foo' package:'libbasic' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3116
     CVSSourceCodeManager checkForExistingModule:'foo' package:'bar'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3117
     CVSSourceCodeManager checkForExistingModule:'cg' package:'private'   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3118
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3119
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3120
    "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
  3121
    "Created: / 23-08-2006 / 14:03:03 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3122
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3123
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3124
createContainerFor:aClass inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3125
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3126
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3127
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3128
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3129
     changeLog entry newString startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3130
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3131
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3132
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3133
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3134
        cmdOut remove.
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
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3138
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3139
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3140
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3141
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3142
    "/ required later.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3143
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3144
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3145
    self activityNotification:'checking for directory ' , checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3146
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3147
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3148
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3149
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3150
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3151
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3152
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3153
    "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3154
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3155
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3156
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3157
        aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3158
    ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3159
        ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3160
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3161
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3162
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3163
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3164
    Class fileOutErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3165
        'CVSSourceCodeManager [error]: fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3166
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3167
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3168
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3169
    ] do:[
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3170
        self fileOutSourceCodeOf:aClass on:aStream
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3171
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3172
    aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3173
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3174
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3175
        'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3176
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3177
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3178
    ].
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
    "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3182
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3183
    self activityNotification:'adding ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3184
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3185
    OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3186
        checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3187
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3188
        OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3189
            checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3190
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3191
            self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3192
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3193
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3194
    cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3195
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3196
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3197
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3198
        inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3199
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3200
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3201
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3202
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3203
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3204
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3205
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3206
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3207
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3208
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3209
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3210
    self activityNotification:'committing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3211
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3212
    OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3213
        "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3214
        logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3215
        s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3216
        s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3217
        s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3218
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3219
        cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' > ', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3220
    ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3221
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3222
        "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3223
        "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3224
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3225
        cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3226
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3227
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3228
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3229
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3230
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3231
        inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3232
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3233
        cmdOut fileSize > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3234
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3235
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3236
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3237
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3238
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3239
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3240
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3241
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3242
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3243
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3244
       'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3245
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3246
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3247
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3248
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3249
    whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3250
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3251
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3252
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3253
    "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3254
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3255
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3256
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3257
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3258
    "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3259
    "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3260
    (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3261
        'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3262
        "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3263
        "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3264
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3265
    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3266
        whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3267
        idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3268
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3269
            startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3270
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3271
            idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3272
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3273
                'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3274
                startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3275
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3276
                'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3277
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3278
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3279
        idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3280
            l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3281
            endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3282
            endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3283
                endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3284
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3285
            newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3286
            (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3287
                newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3288
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3289
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3290
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3291
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3292
    Transcript showCR:'created new sourceContainer for ' , aClass name , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3293
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3294
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3295
    "/ patch the classes revisionInfo (but keep binaryRevision unchanged)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3296
    "/ this makes everyone here believe, that the incore version of the class is based upon
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3297
    "/ the newly checked in version.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3298
    "/ (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
  3299
    "/  correctly for all unchanged methodss)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3300
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3301
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3302
    newRevision notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3303
        changeLog := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3304
                        revisionLogOf:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3305
                        fromRevision:newRevision 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3306
                        toRevision:newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3307
                        fileName:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3308
                        directory:packageDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3309
                        module:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3310
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3311
        (changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3312
            'CVSSourceCodeManager [error]: failed to update revisionString (no log)' errorPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3313
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3314
            entry := (changeLog at:#revisions) first.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3315
            newString := self revisionStringFromLog:changeLog entry:entry forClass:aClass.
2174
a22234dc5283 changed:
fm
parents: 2171
diff changeset
  3316
            self updateVersionMethodOf:aClass for:newString.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3317
            ('CVSSourceCodeManager [info]: updated revisionString to:',newString) infoPrintCR
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3318
        ]
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
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3322
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3323
    Class addChangeRecordForClassCheckIn:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3324
    self postCheckInClass:aClass.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3325
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3326
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3327
    "Created: / 09-12-1995 / 19:13:37 / cg"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3328
    "Modified: / 23-07-1999 / 19:47:59 / stefan"
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3329
    "Modified: / 12-11-2010 / 11:04:42 / cg"
1362
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
createContainerForText:someText inModule:moduleDir package:packageDir container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3333
    "create a container - this does an initial checkin
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3334
     (i.e. cvs add & cvs commit)"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3335
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3336
    |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3337
     startIdx endIdx checkInDir logTmp s|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3338
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3339
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3340
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3341
        cmdOut remove.
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
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3345
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3346
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3347
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3348
    "/ first, check out everything there - this creates the CVS helpfiles
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3349
    "/ required later.
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
    self activityNotification:'checking for directory ' , checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3353
    tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3354
    tempdir isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3355
        ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3356
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3357
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3358
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3359
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3360
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3361
        "/ create the source there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3362
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3363
        tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3364
        [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3365
            aStream := tempFile writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3366
        ] on:FileStream openErrorSignal do:[:ex|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3367
            ('CVSSourceCodeManager [error]: temporary fileout failed -> ', tempFile name) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3368
            ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3369
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3370
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3371
        aStream nextPutAll:someText.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3372
        aStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3373
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3374
        tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3375
            'CVSSourceCodeManager [error]: temporary fileout failed' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3376
            ^ false
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
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3380
        "/ and add it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3381
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3382
        self activityNotification:'adding ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3383
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3384
        OperatingSystem isUNIXlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3385
            checkInDir := tempdir constructString:checkoutName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3386
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3387
            OperatingSystem isMSDOSlike ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3388
                checkInDir := tempdir constructString:(checkoutName copyReplaceAll:$/ with:$\).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3389
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3390
                self error:'VMS case not yet implemented'. "/ add code for VMS ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3391
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3392
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3393
        cmd := 'add ' , fileName , ' > ', '"' , cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3394
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3395
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3396
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3397
            inDirectory:checkInDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3398
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3399
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3400
            ('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3401
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3402
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3403
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3404
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3405
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3406
        "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3407
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3408
        self activityNotification:'committing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3409
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3410
        OperatingSystem isUNIXlike ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3411
            "/ save the log message into another tempFile ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3412
            logTmp := Filename newTemporaryIn:checkInDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3413
            s := logTmp writeStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3414
            s nextPutAll:'initial checkin'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3415
            s close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3416
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3417
            cmd := 'commit -F "', logTmp baseName, '" ', fileName, ' >', '"', cmdOut name, '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3418
        ] ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3419
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3420
            "/ CVS up to V1.9.14 prints the 'new revision' to stderr,
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3421
            "/ CVS V1.9.16 to stdout.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3422
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3423
            cmd := 'commit -m "initial checkin" ' , fileName , ' > ', '"' , cmdOut name, '"', ' 2>&1'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3424
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3425
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3426
        (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3427
            executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3428
            module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3429
            inDirectory:checkInDir "tempdir name"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3430
        ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3431
            cmdOut fileSize > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3432
                whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3433
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3434
                whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3435
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3436
            self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3437
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3438
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3439
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3440
The class has NOT been checked into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3441
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3442
           'CVSSourceCodeManager [error]: cannot checkin modified class source' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3443
            cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3444
            ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3445
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3446
        whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3447
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3448
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3449
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3450
        "/ release it towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3451
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3452
        self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3453
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3454
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3455
        "/ good - its in the CVS repository; now, we need the updated RCS header
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3456
        "/
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  3457
        (whatHappened isEmptyOrNil) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3458
            'CVSSourceCodeManager [warning]: unexpected empty commit command output' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3459
            "/ TODO: scan the file for $Header ...
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3460
            "/ and extract the revision manually
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3461
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3462
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3463
            whatHappened := whatHappened asCollectionOfLines asStringCollection.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3464
            idx := whatHappened indexOfLineStartingWith:'initial revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3465
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3466
                startIdx := 18
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3467
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3468
                idx := whatHappened indexOfLineStartingWith:'new revision:'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3469
                idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3470
                    'CVSSourceCodeManager [warning]: container existed before' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3471
                    startIdx := 14.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3472
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3473
                    'CVSSourceCodeManager [warning]: unexpected commit command output (no new-revision info)' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3474
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3475
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3476
            idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3477
                l := whatHappened at:idx.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3478
                endIdx := (l indexOf:$; startingAt:startIdx) - 1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3479
                endIdx < 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3480
                    endIdx := l size
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3481
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3482
                newRevision := (l copyFrom:startIdx to:endIdx) withoutSpaces.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3483
                (Number fromString:newRevision onError:nil) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3484
                    newRevision := '1.1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3485
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3486
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3487
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3488
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3489
        Transcript showCR:'created new sourceContainer for ' , fileName , '.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3490
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3491
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3492
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3493
    ^ true
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3494
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3495
    "Modified: / 12-11-2010 / 11:04:55 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3496
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3497
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3498
createModule:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3499
    "create a module directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3500
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3501
    |tempdir moduleDir cmdOut cmd|
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
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3505
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3506
    tempdir := self createTempDirectory:nil forModule:moduleName.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3507
    tempdir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3508
        'CVSSourceCodeManager [error]: no tempDir - cannot create moduleDirectory' errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3509
        ^ false
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  3510
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3511
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3512
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3513
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3514
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3515
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3516
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3517
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3518
    "/ create the module directory 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3519
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3520
    moduleDir := tempdir construct:moduleName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3521
    moduleDir exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3522
        'CVSSourceCodeManager [error]: failed to create: ' errorPrint.  moduleDir name errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3523
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3524
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3525
    ].     
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3526
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3527
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3528
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3529
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3530
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3531
    cmd := 'import -m "created from browser" ' , moduleName , ' initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3532
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3533
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3534
        module:moduleName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3535
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3536
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3537
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3538
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3539
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3540
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3541
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3542
    'CVSSourceCodeManager [info]: created new module: ' infoPrint. moduleName infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3543
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3544
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3545
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3546
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3547
    "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
  3548
    "Modified: / 07-01-1998 / 14:18:57 / stefan"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3549
    "Modified: / 12-11-2010 / 11:00:25 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3550
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3551
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3552
createModule:moduleDirName directory:packageDirName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3553
    "create a package directory"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3554
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3555
    |tempdir cmdOut cmd packageDir moduleDir relativePath idx parentPackage|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3556
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3557
    "/ any parent package required ?
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3558
    idx := packageDirName lastIndexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3559
    idx ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3560
        parentPackage := packageDirName copyTo:idx-1.
1839
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3561
        (self checkForExistingModule:moduleDirName directory:parentPackage) ifFalse:[
68163810aa15 obsolete method calls
Claus Gittinger <cg@exept.de>
parents: 1832
diff changeset
  3562
            (self createModule:moduleDirName directory:parentPackage) ifFalse:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3563
                ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3564
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3565
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3566
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3567
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3568
    (moduleDirName asFilename components includes:'core') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3569
        ('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
  3570
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3571
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3572
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3573
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3574
    "/ first, create a temporary work tree
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3575
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3576
    tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3577
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3578
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3579
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3580
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3581
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3582
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3583
    moduleDir := tempdir construct:moduleDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3584
    moduleDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3585
        'CVSSourceCodeManager [error]: command failed: ' errorPrint. cmd errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3586
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3587
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3588
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3589
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3590
        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3591
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3592
    "/ create the package directory there
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3593
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3594
    packageDir := moduleDir construct:packageDirName.
3235
5a6c9f374fb3 exception access
Claus Gittinger <cg@exept.de>
parents: 3231
diff changeset
  3595
    OsError catch:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3596
        packageDir recursiveMakeDirectory.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3597
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3598
    packageDir isDirectory ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3599
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3600
        ('CVSSourceCodeManager [error]: cannot create new directory: ' , packageDir pathName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3601
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3602
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3603
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3604
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3605
    "/ then import it into CVS
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3606
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3607
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3608
    relativePath := moduleDirName asFilename constructString:packageDirName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3609
    cmd := 'import -m "created from browser" . initialV initialR > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3610
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3611
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3612
        module:moduleDirName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3613
        inDirectory:tempdir name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3614
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3615
        'CVSSourceCodeManager [error]: output from cvs:' errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3616
        (cmdOut contentsOfEntireFile) errorPrint.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3617
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3618
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3619
        tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3620
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3621
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3622
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3623
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3624
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3625
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3626
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3627
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3628
      self createModule:'stefan' package:'dummy1'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3629
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3630
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3631
    "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
  3632
    "Created: / 23-08-2006 / 14:04:39 / cg"
2296
f222b660aa55 changed:10 methods
Claus Gittinger <cg@exept.de>
parents: 2250
diff changeset
  3633
    "Modified: / 12-11-2010 / 11:00:18 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3634
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3635
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3636
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
  3637
    "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
  3638
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3639
    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
  3640
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3641
    "
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3642
        self deleteSymbolicName:'stable' path:'stx/libbasic/Array.st'
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  3643
        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
  3644
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3645
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3646
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3647
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
  3648
    "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
  3649
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3650
    ^ self listNonDirectories:aModule, '/', aPackage
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3651
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3652
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3653
     CVSSourceCodeManager getExistingContainersInModule:'stx' package:'libhtml'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3654
     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
  3655
     CVSSourceCodeManager getExistingContainersInModule:'exept' package:'osi'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3656
    "
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3657
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3658
    "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
  3659
!
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3660
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3661
getExistingDirectoriesInModule:aModule
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3662
    "return a list of existing directories."
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3663
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3664
    ^ self listDirectories:aModule.
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3665
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3666
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3667
     CVSSourceCodeManager getExistingDirectoriesInModule:'stx'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3668
     CVSSourceCodeManager getExistingDirectoriesInModule:'cg'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3669
     CVSSourceCodeManager getExistingDirectoriesInModule:'exept'
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3670
    "
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3671
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3672
    "Created: / 23-08-2006 / 14:13:41 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3673
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3674
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3675
getExistingModules
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3676
    "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
  3677
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3678
    ^ self listDirectories:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3679
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3680
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3681
     CVSSourceCodeManager getExistingModules
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3682
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3683
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3684
1664
5fa005755e5f renamed *package* to *directory* to avoid confusion.
Claus Gittinger <cg@exept.de>
parents: 1526
diff changeset
  3685
initialRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3686
    "return a string usable as initial revision string"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3687
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3688
    |cvsRoot|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3689
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3690
    cvsRoot := self getCVSROOTForModule:moduleDir.
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  3691
    cvsRoot := self repositoryTopDirectoryFromCVSRoot:cvsRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3692
    ^ self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3693
        initialRCSRevisionStringFor:aClass 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3694
        in:(cvsRoot , '/' , moduleDir , '/' , packageDir)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3695
        container:fileName
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3696
1496
fc03f35508aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1494
diff changeset
  3697
    "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
  3698
    "Created: / 23-08-2006 / 14:05:46 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3699
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3700
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3701
listDirectories:cvsPath
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3702
    "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
  3703
     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
  3704
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3705
    |directories|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3706
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3707
    self activityNotification:'getting list of directories...'.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3708
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3709
    directories := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3710
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3711
        into:[:fn | directories add:fn]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3712
        nonDirectoriesInto:[:fn | ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3713
    ^ directories asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3714
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3715
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3716
     CVSSourceCodeManager listDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3717
     CVSSourceCodeManager listDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3718
     CVSSourceCodeManager listDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3719
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3720
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3721
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3722
listDirectoriesIn:cvsPath into:dirBlock nonDirectoriesInto:nonDirBlock
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3723
    "enumerate all directories and non-directories in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3724
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3725
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3726
    |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
  3727
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3728
    cvsRoot := self getCVSROOTForModule:nil.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3729
    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
  3730
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3731
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3732
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3733
                        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
  3734
                        module:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3735
                        inDirectory:nil 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3736
                        log:false 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3737
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3738
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3739
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3740
            self warn:'This operation is not possible with this remoteCVS server'.
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3741
            ^ self.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3742
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3743
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3744
        [
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3745
            line := inStream atEnd 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3746
                        ifTrue:[nil] 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3747
                        ifFalse:[ inStream nextLine ]. 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3748
            line notNil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3749
        ] whileTrue:[
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3750
            |idx|
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
            (line startsWith:$d) ifTrue:[
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3753
                "/ '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
  3754
                idx := 0.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3755
                4 timesRepeat:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3756
                    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
  3757
                ].
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3758
                dirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3759
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3760
                "/ '---- 2005-06-02 17:21:20 +0200 1.23 .cvsIgnore'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3761
                idx := 0.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3762
                5 timesRepeat:[
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3763
                    idx := line indexOf:Character space startingAt:idx+1.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3764
                ].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3765
                nonDirBlock value: (line copyFrom:idx+1) withoutSeparators
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3766
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3767
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3768
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3769
        inStream notNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3770
            inStream close.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3771
        ]
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3772
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3773
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3774
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3775
     CVSSourceCodeManager listDirectories:nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3776
     CVSSourceCodeManager listDirectories:'stx'
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3777
     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
  3778
    "
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3779
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3780
2204
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3781
listNonDirectories:cvsPath
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3782
    "return a list of all containers in cvsPath.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3783
     cvsPath is the path relative to the cvs root"
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3784
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3785
    |containers|
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3786
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3787
    self activityNotification:'getting list of containers...'.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3788
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3789
    containers := Set new.
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3790
    self listDirectoriesIn:cvsPath 
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3791
        into:[:fn | ]
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3792
        nonDirectoriesInto:[:fn | containers add:fn].
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3793
    ^ containers asArray sort
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3794
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3795
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3796
     CVSSourceCodeManager listNonDirectories:nil
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3797
     CVSSourceCodeManager listNonDirectories:'stx'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3798
     CVSSourceCodeManager listNonDirectories:'stx/libbasic'
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3799
    "
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3800
!
Claus Gittinger <cg@exept.de>
parents: 2203
diff changeset
  3801
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3802
newestRevisionInFile:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3803
    "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
  3804
     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
  3805
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  3806
    |fullName modulePath inStream line s|
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3807
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3808
    self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3809
         "/ 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
  3810
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3811
        |info|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3812
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3813
        info := self
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3814
                statusOf:nil 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3815
                fileName:classFileName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3816
                directory:packageDir 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3817
                module:moduleDir.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3818
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3819
        info isNil ifTrue:[^ nil].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3820
        ^ info at:#newestRevision ifAbsent:nil
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3821
    ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3822
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3823
    modulePath :=  moduleDir , '/' , packageDir. 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3824
    fullName :=  modulePath , '/' , classFileName.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3825
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3826
    [
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3827
        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
  3828
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3829
        inStream := self 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3830
                        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
  3831
                        module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  3832
                        inDirectory:nil 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3833
                        log:true 
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3834
                        pipe:true.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3835
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3836
        inStream isNil ifTrue:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3837
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', fullName) errorPrintCR.
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3838
            "/ will be raised unconditionally in the near future...
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3839
            SourceCodeManagerError isHandled ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3840
                SourceCodeManagerError raiseRequestErrorString:'cvs rlog failed'.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3841
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3842
            ^ nil
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3843
        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3844
        inStream atEnd ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3845
            "/ mhmh - that could be a cvs configuration problem...
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3846
            "/ the following checks this and raises an appropriate error
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3847
            self 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3848
                executeCVSCommand:('status ' , fullName) 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3849
                module:moduleDir 
3264
60a1c6b42336 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3263
diff changeset
  3850
                inDirectory:nil 
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3851
                log:true 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3852
                outputTo:(WriteStream on:String new) errorTo:(WriteStream on:String new).
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3853
        ] ifFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3854
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3855
            "/ read the commands pipe output and extract the container info
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3856
            "/
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3857
            [inStream atEnd] whileFalse:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3858
                line:= inStream nextLine.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3859
                line notNil ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3860
                    line := line withoutSeparators.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3861
                    line notEmpty ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3862
                        s := line restAfter:'RCS file:' withoutSeparators:true. 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3863
                        s notNil ifTrue:[ 
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3864
                            (UnixFilename named:s) directory baseName = 'Attic' ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3865
                                "/ file has been removed in the repository
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3866
                                ^ #deleted
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3867
                            ].
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3868
                        ].
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3869
                        s := line restAfter:'head:' withoutSeparators:true.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3870
                        s notNil ifTrue:[ |i|
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3871
                            i := s indexOfSeparator.
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3872
                            i ~~ 0 ifTrue:[
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3873
                                s := s copyTo:i-1
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3874
                            ].
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3875
                            ^ s
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3876
                        ].                        
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  3877
                    ].                        
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3878
                ]
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3879
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3880
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3881
        ('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
  3882
    ] ensure:[
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3883
        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
  3884
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  3885
    ^ nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3886
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3887
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3888
     SourceCodeManager newestRevisionInFile:'Array.st' directory:'libbasic' module:'stx'       
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3889
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  3890
2792
25f99a06b4ff comment/format in: #executeCVSCommand:module:inDirectory:log:pipe:orElseOutputTo:errorTo:
Claus Gittinger <cg@exept.de>
parents: 2777
diff changeset
  3891
    "Modified: / 06-03-2012 / 11:55:33 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3892
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3893
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3894
newestRevisionsInModule:module directory:packageDir
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3895
    "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
  3896
     a package directory.
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3897
     Return nil on failure."
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3898
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  3899
    ^ self revisionsInModule:module directory:packageDir fromDate:nil
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3900
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3901
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3902
     SourceCodeManager 
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  3903
        newestRevisionsInModule:'bosch' directory:'dapasx'   
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  3904
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  3905
        newestRevisionsInModule:'stx' directory:'goodies/net/ssl'   
1858
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3906
    "
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3907
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3908
    "Created: / 12-10-2006 / 10:12:59 / cg"
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3909
!
a3038cf8dd3c +newestRevisionsInModule:directory: to get bulk-information
Claus Gittinger <cg@exept.de>
parents: 1839
diff changeset
  3910
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3911
removeContainer:fileName inModule:moduleDir directory:packageDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3912
    "remove a container"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3913
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3914
    |fullName tempdir checkoutName cmdOut cmd tempFile whatHappened|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3915
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3916
    fullName := moduleDir , '/' , packageDir , '/' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3917
    checkoutName :=  moduleDir , '/' , packageDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3918
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3919
    (tempdir := self createLocalDirectory:packageDir inModule:moduleDir with:fileName) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3920
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3921
        self reportError:('cannot checkout ',checkoutName,' (cannot create local directory)').
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3922
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3923
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3924
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3925
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3926
    "/ and remove it to the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3927
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3928
    self activityNotification:'removing ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3929
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  3930
    RecentlyCheckedModulesAndPackages := nil.   "/ flush (could do better...)
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  3931
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3932
    "/
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3933
    "/ check presence of file there
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3934
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3935
    tempFile := (tempdir construct:checkoutName) construct:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3936
    tempFile exists ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3937
        tempdir recursiveRemove.
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  3938
        "/ already removed
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3939
        ^ false
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3940
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3941
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3942
    tempFile exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3943
        tempFile remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3944
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3945
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3946
    cmdOut := Filename newTemporary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3947
    cmdOut exists ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3948
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3949
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3950
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3951
    cmd := 'remove ' , fileName , ' > ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3952
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3953
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3954
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3955
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3956
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3957
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3958
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3959
        self reportError:('cannot remove ',checkoutName).
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3960
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3961
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3962
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3963
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3964
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3965
    "/ commit
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3966
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3967
    self activityNotification:'committing removal of ' , fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3968
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3969
    cmd := 'commit -m "removed container" -l ' , fileName , ' 2> ' , cmdOut name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3970
    (self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3971
        executeCVSCommand:cmd 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3972
        module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3973
        inDirectory:(tempdir constructString:checkoutName)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3974
    ) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3975
        cmdOut fileSize > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3976
            whatHappened := cmdOut contentsOfEntireFile asString.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3977
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3978
            whatHappened := '<< no message >>'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3979
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3980
        self warn:'The following problem was reported by cvs:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3981
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3982
' , whatHappened , '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3983
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3984
The container has NOT been removed into the repository.'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3985
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3986
        cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3987
        tempdir recursiveRemove.
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  3988
        self reportError:'cannot remove container'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3989
        ^ false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3990
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3991
    cmdOut remove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3992
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3993
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3994
    "/ release the temporary tree towards cvs
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3995
    "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3996
    self releaseAndRemove:tempdir module:moduleDir outputTo:nil. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3997
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3998
    tempdir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  3999
    ^ true
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4000
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4001
    "
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4002
     SourceCodeManager checkForExistingContainer:'foo.st' inModule:'stx' directory:'private'. 
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4003
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4004
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4005
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4006
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4007
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4008
    "Created: / 13-09-2006 / 18:31:55 / cg"
2480
c5679df814ba cache flush
Claus Gittinger <cg@exept.de>
parents: 2479
diff changeset
  4009
    "Modified (comment): / 19-08-2011 / 10:44:53 / cg"
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4010
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4011
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4012
removeContainer:fileName inModule:moduleDir package:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4013
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4014
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4015
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4016
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4017
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4018
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4019
    "Modified: / 13-09-2006 / 18:32:25 / cg"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4020
!
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4021
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4022
removeContainerInModule:moduleDir package:packageDir container:fileName
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4023
    "remove a container"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4024
1880
44eeacb0d230 Mark obsolete messages
Stefan Vogel <sv@exept.de>
parents: 1874
diff changeset
  4025
    <resource: #obsolete>
1788
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4026
    self obsoleteMethodWarning.
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4027
    ^ self removeContainer:fileName inModule:moduleDir directory:packageDir
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4028
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4029
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4030
     SourceCodeManager removeContainer:'foo.st' inModule:'stx' package:'private'
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4031
    "
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4032
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4033
    "Modified: / 26-02-1998 / 17:33:57 / stefan"
7ef370e3655d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1783
diff changeset
  4034
    "Modified: / 13-09-2006 / 18:31:52 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4035
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4036
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4037
reportHistoryLogSince:timeGoal 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4038
    filterSTSources:filterSTSourcesBool 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4039
    filterUser:userFilter 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4040
    filterRepository:filterRep 
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4041
    filterModules:filterModules
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4042
    inTo:aBlock
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4043
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4044
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4045
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4046
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4047
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4048
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4049
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4050
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4051
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4052
    |inStream line words recordType fileName user date time rev pkgDir module idx
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4053
     clsName cls clsRev roots info tempDir endReached|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4054
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4055
    CVSRoot isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4056
        'CVSSourceCodeManager [info]: CVSROOT not set' infoPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4057
        ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4058
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4059
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4060
    filterRep notEmptyOrNil ifTrue:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4061
        roots := filterRep.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4062
    ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4063
        roots := Set withAll:(CVSModuleRoots values).
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4064
        roots add:CVSRoot.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4065
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4066
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4067
    "/ must do it in a tempDir, to avoid cvs validating the -D arg
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4068
    "/ against any info found in CVS/Root
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4069
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4070
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4071
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4072
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4073
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4074
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4075
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4076
    roots do:[:eachCvsRoot |
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4077
        |root host cmd|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4078
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4079
        cmd := 'cvs -d ' , eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4080
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4081
        cmd := cmd , ' history -x ARM -a'.
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1425
diff changeset
  4082
        (timeGoal notEmptyOrNil) ifTrue:[
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4083
            cmd := cmd , ' -D "' , timeGoal printString , '"'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4084
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4085
        userFilter notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4086
            userFilter isString ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4087
                cmd := cmd , ' -u "' , userFilter , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4088
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4089
                userFilter do:[:user |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4090
                    cmd := cmd , ' -u "' , user , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4091
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4092
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4093
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4094
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4095
"/ The -m and -x options do not work together in cvs history
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4096
"/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4097
"/        filterModules notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4098
"/            filterModules do:[:aModule |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4099
"/                cmd := cmd , ' -m "' , aModule , '"'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4100
"/            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4101
"/        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4102
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4103
        Transcript showCR:cmd.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4104
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4105
        inStream := PipeStream readingFrom:cmd inDirectory:tempDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4106
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4107
            ('CVSSourceCodeManager [error]: cannot open pipe to ''cvs history''') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4108
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4109
            inStream class streamErrorSignal handle:[:ex |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4110
                ('CVSSourceCodeManager [error]: pipe read error (''cvs history'')') errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4111
                ex return.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4112
            ] do:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4113
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4114
                "/ read the commands pipe output and reformat the lines
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4115
                "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4116
                endReached := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4117
                [endReached] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4118
                    inStream readWait.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4119
                    line := inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4120
                    (endReached := line isNil) ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4121
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4122
                        "/ cvs history line is of the following format:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4123
                        "/ [Ma] date time +xxx user rev name module/package ....
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4124
                        words := line asCollectionOfWords.
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4125
                        words size < 8 ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4126
                            "/ something like 'No records selected' ...
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4127
                        ] ifFalse:[
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4128
                            "a valid history line"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4129
                            recordType := words at:1.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4130
                            fileName := words at:7.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4131
                            user := words at:5.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4132
2099
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4133
                            (filterSTSourcesBool not or:[fileName endsWith:'.st']) ifTrue:[
edfeaba9c51e timeGoal can be a timestamp in reportHistory...
Claus Gittinger <cg@exept.de>
parents: 2098
diff changeset
  4134
                                (userFilter isNil or:[userFilter includes:user]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4135
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4136
                                    date := words at:2.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4137
                                    time := words at:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4138
                                    rev := words at:6.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4139
                                    pkgDir := words at:8.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4140
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4141
                                    module := pkgDir.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4142
                                    (module startsWith:'./') ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4143
                                        module := module copyFrom:3.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4144
                                    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4145
                                    idx := module indexOf:$/.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4146
                                    idx ~~ 0 ifTrue:[    
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4147
                                        module := module copyTo:idx-1.
1362
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
                                    (filterModules isNil 
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4151
                                     or:[filterModules includes:module]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4152
                                        recordType = 'M' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4153
                                            recordType := ' '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4154
                                        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4155
                                            recordType = 'A' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4156
                                                recordType := '+'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4157
                                            ] ifFalse:[
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4158
                                                recordType = 'R' ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4159
                                                    recordType := '-'
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4160
                                                ]
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
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4164
                                        info := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4165
                                        info at:#cvsRecordType       put:recordType.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4166
                                        info at:#date                put:date.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4167
                                        info at:#time                put:time.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4168
                                        info at:#user                put:user.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4169
                                        info at:#fileName            put:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4170
                                        info at:#revision            put:rev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4171
                                        info at:#directory           put:pkgDir.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4172
                                        info at:#className           put:(Smalltalk classNameForFile:fileName).
1481
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4173
                                        info at:#cvsRoot             put:eachCvsRoot.
893aa9458a8f Fix "cvs history"
Stefan Vogel <sv@exept.de>
parents: 1477
diff changeset
  4174
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4175
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4176
                                        "/ for your convenience:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4177
                                        "/  check what the actual version is in the image
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4178
                                        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4179
                                        clsName := Smalltalk classNameForFile:fileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4180
                                        clsName notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4181
                                            cls := Smalltalk classNamed:clsName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4182
                                            (cls notNil and:[(clsRev := cls revision) notNil]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4183
                                                info at:#classesRevision     put:clsRev.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4184
                                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4185
                                        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4186
                                        aBlock value:info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4187
                                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4188
                                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4189
                            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4190
                        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4191
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4192
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4193
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4194
            inStream close.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4195
        ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4196
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4197
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4198
    tempDir recursiveRemove.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4199
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4200
    "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
  4201
    "Modified: / 29-08-2006 / 13:17:50 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4202
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4203
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4204
reportHistoryLogSince:timeGoal filterSTSources:filter filterUser:userFilter filterRepository:filterRep inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4205
    "process a full historyLog, evaluate aBlock for each entry, passing 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4206
     the logs info in a dictionary.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4207
     This walks over all possible repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4208
     filterRep may be a collection of repository names 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4209
     (i.e. 'stc', 'exept', 'phx' etc.) to only report changes made to one
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4210
     of those repositories.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4211
     filterUser, if non-nil, will filter only changes made by that user."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4212
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4213
    ^self
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4214
        reportHistoryLogSince:timeGoal 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4215
        filterSTSources:filter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4216
        filterUser:userFilter 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4217
        filterRepository:filterRep 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4218
        filterModules:nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4219
        inTo:aBlock
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4220
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4221
    "Modified: / 17.1.2001 / 13:12:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4222
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4223
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4224
revisionInfoFromString:aString
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4225
    "{ Pragma: +optSpace }"
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4226
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4227
    "return a dictionary filled with revision info.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4228
     This extracts the relevant info from aString."
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4229
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4230
    ^ self revisionInfoFromString:aString inClass:nil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4231
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4232
    "
2203
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4233
     self revisionInfoFromString:(Array version_CVS)   
5e9d516ef6d8 comment/format in: #revisionInfoFromString:
Claus Gittinger <cg@exept.de>
parents: 2196
diff changeset
  4234
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4235
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4236
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4237
    "Modified: / 01-07-2011 / 13:54:02 / cg"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4238
!
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4239
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4240
revisionInfoFromString:aString inClass:aClass
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4241
    "{ Pragma: +optSpace }"
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4242
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4243
    "return a dictionary filled with revision info.
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4244
     This extracts the relevant info from aString."
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4245
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4246
    |fixedString autoFixHolder|
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4247
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4248
    autoFixHolder := UserPreferences current showBadRevisionStringDialogs not asValue.
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4249
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4250
    Dialog aboutToOpenBoxNotificationSignal handle:[:ex |
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  4251
        ex box addCheckBoxAtBottom:'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
  4252
        ex proceed.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4253
    ] do:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4254
        "/ temporary fix Felix' bad string translation:
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4255
        (aString startsWith:'§Header:') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4256
            (aString endsWith:'Exp §') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4257
                fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4258
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4259
                aClass isNil ifTrue:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4260
                    autoFixHolder value ifFalse:[
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4261
                        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
  4262
                    ]
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4263
                ] ifFalse:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4264
                    (autoFixHolder value 
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4265
                        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
  4266
                    ) ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4267
                        self updateVersionMethodOf:aClass for:fixedString.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4268
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4269
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4270
            ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4271
        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4272
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4273
        "/ 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
  4274
        (aString startsWith:'Header: ') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4275
            (aString endsWith:'Exp ') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4276
                fixedString := '$' , aString , '$'.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4277
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4278
                aClass isNil ifTrue:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4279
                    autoFixHolder value ifFalse:[
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4280
                        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
  4281
                    ]
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4282
                ] ifFalse:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4283
                    (autoFixHolder value 
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4284
                        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
  4285
                    ) ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4286
                        self updateVersionMethodOf:aClass for:fixedString.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4287
                    ].
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4288
                ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4289
            ].
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4290
        ].
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4291
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4292
        "/ temporary fix translated (§-sign) and not restored strings:
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4293
        (aString startsWith:'§Header: ') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4294
            (aString endsWith:'Exp §') ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4295
                fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4296
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4297
                aClass isNil ifTrue:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4298
                    autoFixHolder value ifFalse:[
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4299
                        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
  4300
                    ]
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4301
                ] ifFalse:[
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4302
                    (autoFixHolder value 
2481
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4303
                        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
  4304
                    ) ifTrue:[
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4305
                        self updateVersionMethodOf:aClass for:fixedString.
c0fa5e3e5b92 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2480
diff changeset
  4306
                    ].
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4307
                ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4308
            ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4309
        ].
2482
f829c71d9532 initial checkin
Claus Gittinger <cg@exept.de>
parents: 2481
diff changeset
  4310
        UserPreferences current showBadRevisionStringDialogs:autoFixHolder value not.
2401
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4311
    ].
4c632b026c89 changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2398
diff changeset
  4312
2545
c98f48b1f15c changed: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2540
diff changeset
  4313
    ^ CVSVersionInfo fromRCSString:(fixedString ? aString)
2398
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4314
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4315
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4316
     self revisionInfoFromString:(Array version_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4317
     self revisionInfoFromString:(stx_libbasic2 extensionsVersion_CVS)   
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4318
    "
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4319
a6671fa24ee5 added: #revisionInfoFromString:inClass:
Claus Gittinger <cg@exept.de>
parents: 2363
diff changeset
  4320
    "Created: / 01-07-2011 / 13:51:41 / cg"
2776
34e2fea3d517 duplicate code (ouch) refactored
Claus Gittinger <cg@exept.de>
parents: 2773
diff changeset
  4321
    "Modified: / 28-02-2012 / 10:40:48 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4322
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4323
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4324
revisionLogOf:clsOrNil fromRevision:firstRevOrNil toRevision:lastRevOrNil numberOfRevisions:numRevisionsOrNil fileName:classFileName directory:packageDir module:moduleDir
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4325
    "return info about the repository container and
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4326
     (part of) the revisionlog as a collection of revision entries.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4327
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4328
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4329
     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
  4330
     only numRevions of the newest revision infos will be collected.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4331
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4332
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4333
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4334
            #container          -> the RCS/CVS container file name 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4335
            #cvsRoot            -> the CVS root (repository) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4336
            #filename           -> the actual source file name
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4337
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4338
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4339
            #revisions          -> collection of per-revision info (see below)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4340
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4341
            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
  4342
             -If firstRevOrNil is nil, the first revision is the initial revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4343
              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
  4344
             -If lastRevOrNil is nil, the last revision is the newest revision
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4345
              otherwise, the log ends with that revision.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4346
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4347
             -If both are nil, all logEntries are extracted.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4348
             -If both are 0 (not nil), no logEntries are extracted (i.e. only the header).
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4349
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4350
            per revision info consists of one record per revision:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4351
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4352
              #revision              -> the revision string
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4353
              #author                -> who checked that revision into the repository
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4354
              #date                  -> when was it checked in
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4355
              #state                 -> the RCS state
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4356
              #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
  4357
              #logMessage            -> the checkIn log message
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4358
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4359
            revisions are ordered newest first 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4360
            (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
  4361
            Attention: if state = 'dead' that revision is no longer valid.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4362
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4363
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4364
    |tempDir fullName modulePath inStream inHeaderInfo atEnd line idx
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4365
     info record revisionRecords s headerOnly msg selectedRevisions|
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4366
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4367
    self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4368
        tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4369
        tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4370
            ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4371
            ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  4372
        ].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4373
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4374
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4375
    [
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4376
        |cmd revArg|
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4377
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4378
        modulePath :=  moduleDir , '/' , packageDir. 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4379
        fullName :=  modulePath , '/' , classFileName.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4380
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4381
        self use_rlog ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4382
            self createEntryFor:fullName 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4383
                 module:moduleDir
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4384
                 in:(tempDir construct:modulePath) 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4385
                 revision:'1.1' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4386
                 date:'dummy' 
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4387
                 special:''
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4388
                 overwrite:false.
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4389
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4390
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4391
        revArg := ''.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4392
        headerOnly := false.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4393
        (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
  4394
            (firstRevOrNil == 0 and:[lastRevOrNil == 0]) ifTrue:[
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4395
                revArg := '-h'.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4396
                headerOnly := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4397
            ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4398
                revArg := '-r'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4399
                firstRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4400
                    revArg := revArg , firstRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4401
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4402
                revArg := revArg , ':'.
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4403
                lastRevOrNil notNil ifTrue:[
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4404
                    revArg := revArg , lastRevOrNil
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4405
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4406
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4407
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4408
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4409
        headerOnly ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4410
            msg := 'fetching revision info '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4411
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4412
            msg := 'reading revision log '
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4413
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4414
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4415
            msg := msg , 'in ' , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4416
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4417
            msg := msg , 'of ', clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4418
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4419
        self activityNotification:msg,'...'.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4420
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4421
        self use_rlog ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4422
            cmd := ('rlog ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4423
        ] ifFalse:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4424
            cmd := ('log ' , revArg , ' ' , fullName).
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4425
        ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4426
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4427
        inStream := self 
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4428
                        executeCVSCommand:('rlog ' , revArg , ' ' , fullName) 
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4429
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4430
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4431
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4432
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4433
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4434
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4435
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4436
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4437
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4438
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4439
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4440
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4441
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4442
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4443
        inHeaderInfo := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4444
        [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4445
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4446
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4447
                |gotIt|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4448
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4449
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4450
                #('RCS file:'        #container
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4451
                  'Working file:'    #filename
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4452
                  'head:'            #newestRevision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4453
                  'total revisions:' #numberOfRevisions
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4454
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4455
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4456
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4457
                        s notNil ifTrue:[info at:key put:s. gotIt := true].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4458
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4459
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4460
                gotIt ifFalse:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4461
                    (line startsWith:'symbolic names:') ifTrue:[
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4462
                        |tags tokens|
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4463
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4464
                        tags := Dictionary new.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4465
                        line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4466
                        [line notNil 
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4467
                         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
  4468
                            tokens := line asCollectionOfSubstringsSeparatedBy:$:.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4469
                            tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4470
                            line:= inStream nextLine.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4471
                        ].
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4472
                        info at:#symbolicNames put:tags.
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4473
                    ].
2773
2e1a3c72e4f1 changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2741
diff changeset
  4474
                    (line notNil and:[line startsWith:'description:']) ifTrue:[inHeaderInfo := false].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4475
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4476
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4477
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4478
        inStream nextLine. "/ skip separating line after description.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4479
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4480
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4481
            ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4482
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4483
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4484
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4485
        "/ strip selected revisions from the total-revisions entry
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4486
        s := info at:#numberOfRevisions.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4487
        (idx := s indexOf:$;) ~~ 0 ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4488
            info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1)).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4489
            idx := s indexOf:$: startingAt:idx.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4490
            selectedRevisions := Integer readFrom:(s copyFrom:idx+1) onError:0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4491
        ] ifFalse:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4492
            info at:#numberOfRevisions put:(Integer readFrom:s onError:[1]).
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4493
            selectedRevisions := 0.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4494
        ].
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4495
        info at:#numberOfSelectedRevisions put:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4496
        headerOnly ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4497
            "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4498
            "/ continue to read the commands pipe output 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4499
            "/ and extract revision info records
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4500
            "/
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4501
            inStream atEnd ifTrue:[
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4502
                selectedRevisions > 0 ifTrue:[
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4503
                    "/ suppress warning. if we try to get the info of a non-existing revision"
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4504
                    ('CVSSourceCodeManager [warning]: empty log for ', fullName) errorPrintCR.
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4505
                ].
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4506
                ^ info
2820
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4507
            ].
d6e9f3f4621c changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Stefan Vogel <sv@exept.de>
parents: 2814
diff changeset
  4508
2822
8c1a217f0755 changed:
Stefan Vogel <sv@exept.de>
parents: 2820
diff changeset
  4509
            revisionRecords := OrderedCollection new:selectedRevisions.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4510
            info at:#revisions put:revisionRecords.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4511
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4512
            atEnd := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4513
            [atEnd or:[inStream atEnd]] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4514
                record := self readRevisionLogEntryFromStream:inStream.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4515
                record isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4516
                    atEnd := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4517
                ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4518
                    revisionRecords add:record.
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4519
                ].
2211
3d6f4b6bc4ee comment/format in: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2206
diff changeset
  4520
                (numRevisionsOrNil notNil and:[revisionRecords size >= numRevisionsOrNil]) ifTrue:[
1451
561003a458bb Show tags in revisionLog
Stefan Vogel <sv@exept.de>
parents: 1448
diff changeset
  4521
                    atEnd := true
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4522
                ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4523
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4524
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4525
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4526
        inStream notNil ifTrue:[inStream close].
1464
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4527
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4528
        tempDir notNil ifTrue:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4529
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4530
                ('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
  4531
            ] do:[
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4532
                tempDir recursiveRemove
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4533
            ].
edce7759095b STEFAN: rlog does not work under WINDOWS !!!
Claus Gittinger <cg@exept.de>
parents: 1459
diff changeset
  4534
        ].
1779
ded4528d9ac1 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1778
diff changeset
  4535
        self activityNotification:nil.
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4536
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4537
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4538
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4539
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4540
     SourceCodeManager revisionLogOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4541
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:'1.43' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4542
     SourceCodeManager revisionLogOf:Array fromRevision:'1.40' toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4543
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:'1.3'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4544
     SourceCodeManager revisionLogOf:Array fromRevision:nil toRevision:nil  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4545
     SourceCodeManager revisionLogOf:Array fromRevision:0 toRevision:0  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4546
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4547
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  4548
    "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
  4549
    "Modified: / 29-01-1997 / 16:51:30 / stefan"
2773
2e1a3c72e4f1 changed: #revisionLogOf:fromRevision:toRevision:numberOfRevisions:fileName:directory:module:
Claus Gittinger <cg@exept.de>
parents: 2741
diff changeset
  4550
    "Modified: / 05-02-2012 / 19:03:06 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4551
!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  4552
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4553
revisionLogOfPackageInDirectory:packageDir module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4554
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4555
     The returned information is a list of structures (IdentityDictionary)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4556
     each filled with:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4557
            #container          -> the RCS/CVS container file name 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4558
            #cvsRoot            -> the CVS root (repository) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4559
            #filename           -> the actual source file name
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4560
            #newestRevision     -> the revisionString of the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4561
            #numberOfRevisions  -> the number of revisions in the container (nil for all)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4562
            #revisions          -> collection of per-revision info (see below)
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4563
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4564
            firstRev / lastRef specify from which revisions a logEntry is wanted:
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4565
             -If firstRev is nil, the first revision is the initial revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4566
              otherwise, the log starts with that revision.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4567
             -If lastRef is nil, the last revision is the newest revision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4568
              otherwise, the log ends with that revision.
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
             -If both are nil, all logEntries are extracted.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4571
             -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
  4572
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4573
            per revision info consists of one record per revision:
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
              #revision              -> the revision string
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4576
              #author                -> who checked that revision into the repository
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4577
              #date                  -> when was it checked in
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4578
              #state                 -> the RCS state
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4579
              #numberOfChangedLines  -> the number of changed line w.r.t the previous
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4580
              #logMessage            -> the checkIn log message
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4581
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4582
            revisions are ordered newest first 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4583
            (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
  4584
            Attention: if state = 'dead' that revision is no longer valid.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4585
        "
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
    |tempDir modulePath inStream inHeaderInfo atEnd line idx
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4588
     info record revisionRecords s headerOnly msg infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4589
     fn container|
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
    self use_rlog ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4592
        tempDir := self createTempDirectory:nil forModule:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4593
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4594
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4595
    [
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4596
        |cmd revArg|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4597
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4598
        modulePath :=  moduleDir , '/' , packageDir. 
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
        self use_rlog ifFalse:[
2027
2dca45de7d46 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2021
diff changeset
  4601
self halt:'non-rlog no longer supported'.
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4602
^ self.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4603
"/            self createEntryFor:fullName 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4604
"/                 module:moduleDir
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4605
"/                 in:(tempDir construct:modulePath) 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4606
"/                 revision:'1.1' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4607
"/                 date:'dummy' 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4608
"/                 special:''
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4609
"/                 overwrite:false.
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
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4612
        revArg := ''.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4613
        headerOnly := false.
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
        headerOnly ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4616
            msg := 'fetching revision info '
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4617
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4618
            msg := 'reading revision log '
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4619
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4620
        msg := msg , 'in package ' , modulePath.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4621
        self activityNotification:msg,'...'.
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
        self use_rlog ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4624
            cmd := ('rlog ' , revArg , ' ' , modulePath).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4625
        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4626
            cmd := ('log ' , revArg , ' ' , modulePath).
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 := self 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4630
                        executeCVSCommand:cmd 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4631
                        module:moduleDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4632
                        inDirectory:tempDir 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4633
                        log:true 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4634
                        pipe:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4635
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4636
        inStream isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4637
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4638
            ^ nil
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4639
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4640
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4641
        infoCollection := Dictionary new.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4642
        [inStream atEnd] whileFalse:[
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4643
            "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4644
            "/ read the commands pipe output and extract the container info
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
            info := IdentityDictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4647
            inHeaderInfo := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4648
            [inHeaderInfo and:[inStream atEnd not]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4649
                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4650
                line notEmptyOrNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4651
                    |gotIt|
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
                    gotIt := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4654
                    #('RCS file:'        #container
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4655
                      'Working file:'    #filename
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4656
                      'head:'            #newestRevision
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4657
                      'total revisions:' #numberOfRevisions
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4658
                     ) pairWiseDo:[:word :key |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4659
                        gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4660
                            s := line restAfter:word withoutSeparators:true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4661
                            s notNil ifTrue:[info at:key put:s. gotIt := true].                        
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4662
                        ]
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
                    gotIt ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4665
                        (line startsWith:'symbolic names:') ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4666
                            |tags tokens|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4667
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4668
                            tags := Dictionary new.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4669
                            line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4670
                            [line notNil 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4671
                             and:[(line startsWith:Character space) or:[line startsWith:Character tab]]] whileTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4672
                                tokens := line asCollectionOfSubstringsSeparatedBy:$:.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4673
                                tags at:(tokens first withoutSeparators) put:(tokens second withoutSeparators).
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4674
                                line:= inStream nextLine.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4675
                            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4676
                            info at:#symbolicNames put:tags.
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
                        (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4679
                    ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4680
                ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4681
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4682
            inStream nextLine. "/ skip separating line after description.
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
            info isEmpty ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4685
                ('CVSSourceCodeManager [warning]: no log for ', modulePath) errorPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4686
            ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4687
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4688
                "/ strip selected revisions from the total-revisions entry
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4689
                s := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4690
                (idx := s indexOf:$;) ~~ 0 ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4691
                    info at:#numberOfRevisions put:(Integer readFrom:(s copyTo:idx - 1))
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4692
                ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4693
                    info at:#numberOfRevisions put:(Integer readFrom:s onError:[1])
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4694
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4695
                headerOnly ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4696
                    |numRevisions|
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4697
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4698
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4699
                    "/ continue to read the commands pipe output 
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4700
                    "/ and extract revision info records
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4701
                    "/
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4702
                    numRevisions := info at:#numberOfRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4703
                    revisionRecords := OrderedCollection new:numRevisions.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4704
                    info at:#revisions put:revisionRecords.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4705
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4706
                    atEnd := false.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4707
                    [atEnd or:[inStream atEnd]] whileFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4708
                        record := self readRevisionLogEntryFromStream:inStream.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4709
                        record isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4710
                            atEnd := true.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4711
                        ] ifFalse:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4712
                            revisionRecords add:record.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4713
                        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4714
                        (numRevisions notNil and:[revisionRecords size >= numRevisions]) ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4715
                            atEnd := true
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4716
                        ]
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4717
                    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4718
                ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4719
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4720
            fn := info at:#filename ifAbsent:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4721
            fn isNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4722
                container := info at:#container ifAbsent:nil.
3231
b3cce588c936 Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents: 3112
diff changeset
  4723
                fn := container asFilename baseName copyButLast:2.   "/ remove ',v' suffix
1989
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4724
                info at:#filename put:fn.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4725
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4726
            infoCollection at:(info at:#filename) put:info.    
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4727
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4728
    ] ensure:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4729
        inStream notNil ifTrue:[inStream close].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4730
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4731
        tempDir notNil ifTrue:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4732
            OperatingSystem accessDeniedErrorSignal handle:[:ex |
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4733
                ('CVSSourceCodeManager [warning]: could not remove tempDir ', tempDir pathName) infoPrintCR.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4734
            ] do:[
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4735
                tempDir recursiveRemove
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4736
            ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4737
        ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4738
        self activityNotification:nil.
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4739
    ].
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4740
    ^ infoCollection
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4741
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4742
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4743
     CVSSourceCodeManager revisionLogOfPackageInDirectory:'libbasic3' module:'stx'  
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4744
    "
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4745
!
d4e5428a3b58 bulk revision info
Claus Gittinger <cg@exept.de>
parents: 1963
diff changeset
  4746
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4747
revisionsInModule:module directory:packageDir fromDate:aDateOrNilForNewest
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4748
    "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
  4749
     a package directory. Return nil on failure."
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4750
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4751
    |tempDir modulePath inStream info|
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4752
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4753
    self use_rlog ifFalse:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4754
         "/ Uses 'cvs status' - rlog seems not to work
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4755
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4756
        ^ nil.
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
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4759
    modulePath :=  module , '/' , packageDir. 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4760
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4761
    [
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4762
        |revisionUsed dateSelector searchFor|
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
        self activityNotification:('Fetching revision infos for %1%2'
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4765
                                    bindWith:modulePath
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4766
                                    with:(aDateOrNilForNewest isNil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4767
                                                ifTrue:[ '' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4768
                                                ifFalse:[ ' of ',aDateOrNilForNewest printString])).
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
        dateSelector := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4771
                            ifTrue:[ '-h ' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4772
                            ifFalse:[ '-S -d "%1"' bindWith:(aDateOrNilForNewest printStringFormat:'%y-%m-%d') ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4773
        inStream := self 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4774
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:dateSelector with:modulePath) 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4775
                        module:module 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4776
                        inDirectory:tempDir 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4777
                        log:true 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4778
                        pipe:true.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4779
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4780
        inStream isNil ifTrue:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4781
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4782
            ^ nil
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
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
        "/ read the commands pipe output and extract the container infos
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4787
        "/
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4788
        searchFor := aDateOrNilForNewest isNil 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4789
                            ifTrue:[ 'head:' ]
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4790
                            ifFalse:[ 'revision ' ].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4791
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4792
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:searchFor.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4793
    ] ensure:[
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4794
        inStream notNil ifTrue:[inStream close].
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4795
    ].
2297
c52adb2af4df changed: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2296
diff changeset
  4796
    self breakPoint:#cg.
2188
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4797
    ^ info
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4798
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4799
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4800
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4801
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:(Date today subtractDays:7)
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4802
     SourceCodeManager 
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4803
        revisionsInModule:'exept' directory:'osi/asn1' fromDate:nil
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4804
    "
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4805
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4806
    "Created: / 12-10-2006 / 10:12:59 / cg"
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4807
!
04731db1087e added: #revisionsInModule:directory:fromDate:
Claus Gittinger <cg@exept.de>
parents: 2174
diff changeset
  4808
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4809
revisionsInModule:module directory:packageDir taggedAs:symbolicName
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4810
    "return a list of filename-module associations for the containers in
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4811
     a package directory. Return nil on failure."
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4812
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4813
    |tempDir modulePath inStream info|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4814
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4815
    self use_rlog ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4816
         "/ Uses 'cvs status' - rlog seems not to work
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4817
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4818
        ^ nil.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4819
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4820
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4821
    modulePath :=  module , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4822
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  4823
    self activityNotification:('Fetching revision infos for %1%2'
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  4824
                                    bindWith:modulePath
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  4825
                                    with:(' tagged as "',symbolicName,'"')).
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  4826
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4827
    [
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4828
        |revisionUsed tagSelector searchFor|
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4829
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  4830
        tagSelector := '-S -r"%1"' bindWith:symbolicName.
2938
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4831
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4832
                        executeCVSCommand:('rlog -N -l %1 %2' bindWith:tagSelector with:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4833
                        module:module 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4834
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4835
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4836
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4837
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4838
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4839
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs rlog ', modulePath) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4840
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4841
        ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4842
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4843
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4844
        "/ read the commands pipe output and extract the container infos
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4845
        "/
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4846
        info := self fetchRevisionsFromRLogStream:inStream searchForKeyword:'revision '.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4847
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4848
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4849
    ].
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4850
    self breakPoint:#cg.
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4851
    ^ info
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4852
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4853
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4854
     SourceCodeManager 
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4855
        revisionsInModule:'stx' directory:'libbasic2' taggedAs:'stable'
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4856
    "
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4857
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4858
    "Created: / 12-10-2006 / 10:12:59 / cg"
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4859
!
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
  4860
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4861
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool class:aClass
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4862
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4863
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4864
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4865
     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
  4866
     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
  4867
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4868
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4869
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4870
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4871
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4872
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4873
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4874
        path:((self sourceInfoOfClass:aClass) at:#pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4875
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4876
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4877
     self setSymbolicName:'foo' revision:nil overWrite:false class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4878
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4879
     self setSymbolicName:'foo' revision:nil overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4880
     self setSymbolicName:'foo' revision:'1.1' overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4881
     self setSymbolicName:'foo' revision:0 overWrite:true class:Array
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4882
    "
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
    "Created: / 12-09-2006 / 12:56:52 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4885
!
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
setSymbolicName:symbolicName revision:rev overWrite:overWriteBool classes:aCollectionOfClasses
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4888
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4889
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4890
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4891
     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
  4892
     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
  4893
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4894
     If filename is nil, the symbolicName for a whole package is set"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4895
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4896
    |pathes alreadyWarned|
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4897
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4898
    alreadyWarned := 0.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4899
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4900
    pathes := aCollectionOfClasses 
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  4901
                collect:[:cls | 
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4902
                    |info path answer|
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4903
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4904
                    cls isLoaded ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4905
                        Transcript showCR:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4906
                        alreadyWarned == 0 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4907
                            Dialog warn:('Cannot tag unloaded class: %1.' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4908
                            alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4909
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4910
                            alreadyWarned == 1 ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4911
                                answer := Dialog confirmWithCancel:('Cannot tag unloaded class: %1.\\Suppress further warnings?' withCRs bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4912
                                answer == nil ifTrue:[^ self].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4913
                                answer == true ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4914
                                    alreadyWarned := alreadyWarned + 1.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4915
                                ].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4916
                            ] 
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4917
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  4918
                        nil
3281
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4919
                    ] ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4920
                        info := self sourceInfoOfClass:cls.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4921
                        info isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4922
                            Dialog warn:('No source info for: %1 (not in repository?)' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4923
                            nil
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4924
                        ] ifFalse:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4925
                            path := info at:#pathInRepository ifAbsent:nil.
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4926
                            path isNil ifTrue:[
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4927
                                Dialog warn:('No source info for: %1 (not in repository?)' bindWith:cls name).
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4928
                            ].
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4929
                            path
15de87c427d4 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3279
diff changeset
  4930
                        ].
3278
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  4931
                    ].
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  4932
                ]
e4d517d8e605 class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3277
diff changeset
  4933
                thenSelect:[:path | path notNil].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4934
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4935
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4936
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4937
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4938
        pathes:pathes
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4939
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4940
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4941
     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
  4942
     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
  4943
     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
  4944
     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
  4945
     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
  4946
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4947
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4948
    "Created: / 12-09-2006 / 12:58:23 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4949
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4950
1459
83c50df5be7f Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents: 1457
diff changeset
  4951
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
  4952
    "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
  4953
     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
  4954
     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
  4955
     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
  4956
     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
  4957
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  4958
     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
  4959
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4960
    self
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4961
        setSymbolicName:symbolicName 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4962
        revision:rev 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4963
        overWrite:overWriteBool 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4964
        pathes:(Array with:pathInRepository)
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4965
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
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4968
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4969
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4970
     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
  4971
    "
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4972
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4973
    "Modified: / 12-09-2006 / 12:37:20 / cg"
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4974
!
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4975
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4976
setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4977
    "set a symbolicName for revision rev.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4978
     If rev is nil, set it for the head (most recent) revision.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4979
     If rev is 0, delete the symbolic name.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4980
     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
  4981
     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
  4982
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4983
     If filename is nil, the symbolicName for a whole package is set.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4984
     If multiple pathes are given, the revision MUST be nil."
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4985
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4986
    |argumentString result errorStream outStream moduleDirs symbolicName|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4987
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4988
    symbolicName := (symbolicNameArg includes:Character space) 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4989
                        ifTrue:[ '"',symbolicNameArg,'"' ]
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4990
                        ifFalse:[ symbolicNameArg ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4991
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4992
    pathesInRepository size > 1 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4993
        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
  4994
    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4995
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4996
    moduleDirs := pathesInRepository 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4997
                    collect:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4998
                        (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  4999
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5000
    moduleDirs do:[:moduleDir |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5001
        |pathesInModule pathesInModuleAsArgument|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5002
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5003
        pathesInModule := pathesInRepository
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5004
                    select:[:pathInRepository |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5005
                        |moduleOfThisPath|
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5006
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5007
                        moduleOfThisPath := (pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5008
                        moduleOfThisPath = moduleDir
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5009
                    ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5010
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5011
        rev = 0 ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5012
            argumentString := ' -d '.
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5013
        ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5014
            argumentString := ' -r ', (rev ? 'HEAD').
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5015
            overWriteBool ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5016
                argumentString := argumentString, ' -F'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5017
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5018
        ].
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5019
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5020
        pathesInModuleAsArgument := pathesInModule 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5021
                                        collect:[:eachPath |
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5022
                                            (eachPath includes:Character space) ifTrue:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5023
                                                '"',eachPath,'"'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5024
                                            ] ifFalse:[
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5025
                                                eachPath
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5026
                                            ].
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5027
                                        ].
1790
50c24ca2ae45 fix setting tags on more than one file
Stefan Vogel <sv@exept.de>
parents: 1788
diff changeset
  5028
        pathesInModuleAsArgument := pathesInModuleAsArgument asStringCollection asStringWith:Character space.
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5029
2947
f58effe8daf2 project diff fixed (care for version and loos methods)
Claus Gittinger <cg@exept.de>
parents: 2938
diff changeset
  5030
        self activityNotification:('setting symbolic name "%1" for: %2' bindWith:symbolicName with:pathesInModuleAsArgument).
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5031
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5032
        errorStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5033
        outStream := '' writeStream.
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5034
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5035
        result := self  
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5036
                    executeCVSCommand:('rtag ' , argumentString, ' ', symbolicName, ' ', pathesInModuleAsArgument) 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5037
                    module:moduleDir 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5038
                    inDirectory:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5039
                    log:true
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5040
                    outputTo:outStream
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5041
                    errorTo:errorStream.
3294
a3aa19619c3c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3292
diff changeset
  5042
        self activityNotification:nil.
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5043
        (result not or:[errorStream size ~~ 0]) ifTrue:[
3279
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5044
            SourceCodeManagerError raiseRequestWith:errorStream contents errorString:' cvs tag failed: ', pathesInModuleAsArgument.
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5045
        ] ifFalse:[
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5046
            (outStream contents asStringCollection contains:[:someLine| someLine startsWithAnyOf:'WE']) ifTrue:[
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5047
                SourceCodeManagerError raiseRequestWith:outStream contents errorString:' cvs tag could not be set: ', pathesInModuleAsArgument.
ab20a878a2db class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3278
diff changeset
  5048
            ].
1457
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5049
        ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5050
    ].
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5051
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5052
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5053
     self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5054
     self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5055
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5056
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5057
        setSymbolicName:'test1' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5058
        revision:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5059
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5060
        path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5061
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5062
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5063
        setSymbolicName:'test2' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5064
        revision:nil 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5065
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5066
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5067
                  'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5068
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5069
     self 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5070
        setSymbolicName:'test2' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5071
        revision:0 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5072
        overWrite:true 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5073
        pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st' 
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5074
                  '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
  5075
    "
1783
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5076
e72b11658c9f bulk tagging
Claus Gittinger <cg@exept.de>
parents: 1781
diff changeset
  5077
    "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
  5078
!
8383e94050aa Use cvs rlog and cvs rls to avoid temp directory creation
Stefan Vogel <sv@exept.de>
parents: 1451
diff changeset
  5079
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5080
statusOf:clsOrNil fileName:classFileName directory:packageDir module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5081
    "return info about the status repository container.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5082
     Return nil on failure.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5083
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5084
     The returned information is a structure (IdentityDictionary)
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5085
     filled with:
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5086
            #newestRevision     -> the revisionString of the newest revision
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5087
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5088
     This is much faster than revisionLog info (especially, if there are many revisions),
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5089
     and all we need is a classes newest version number.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5090
        "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5091
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5092
    |tempDir fullName modulePath inStream line   
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5093
     info s msg|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5094
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5095
    modulePath :=  moduleDir , '/' , packageDir. 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5096
    fullName :=  modulePath , '/' , classFileName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5097
    tempDir := self createTempDirectory:nil forModule:nil.
2127
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5098
    tempDir isNil ifTrue:[
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5099
        ('CVSSourceCodeManager [error]: no tempDir - cannot extract log') errorPrintCR.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5100
        ^ nil.
8954cb7bdb23 checks if tempdir is nil
fm
parents: 2105
diff changeset
  5101
    ].
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5102
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5103
    [
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5104
        self createEntryFor:fullName 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5105
             module:moduleDir
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5106
             in:(tempDir construct:modulePath) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5107
             revision:'1.1' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5108
             date:'dummy' 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5109
             special:''
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5110
             overwrite:false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5111
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5112
        msg := 'fetching status info of '.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5113
        clsOrNil isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5114
            msg := msg , fullName.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5115
        ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5116
            msg := msg , clsOrNil name.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5117
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5118
        self activityNotification:msg.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5119
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5120
        inStream := self 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5121
                        executeCVSCommand:('status ' , fullName) 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5122
                        module:moduleDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5123
                        inDirectory:tempDir 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5124
                        log:true 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5125
                        pipe:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5126
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5127
        inStream isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5128
            ('CVSSourceCodeManager [error]: cannot open pipe to cvs log ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5129
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5130
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5131
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5132
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5133
        "/ read the commands pipe output and extract the container info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5134
        "/
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5135
        info := IdentityDictionary new.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5136
        [inStream atEnd] whileFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5137
            line:= inStream nextLine.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5138
            line notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5139
                line := line withoutSeparators.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5140
            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5141
            line size > 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5142
                |gotIt i|
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5143
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5144
                gotIt := false.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5145
                #(
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5146
                  'Repository revision:'  #newestRevision
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5147
                  'File:'  #fileStatus
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5148
                 ) pairWiseDo:[:word :key |
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5149
                    gotIt ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5150
                        s := line restAfter:word withoutSeparators:true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5151
                        s notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5152
                            i := s indexOfSeparator.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5153
                            i ~~ 0 ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5154
                                s := s copyTo:i-1
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5155
                            ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5156
                            info at:key put:s.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5157
                            gotIt := true.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5158
                        ].                        
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5159
                    ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5160
                ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5161
            ]
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5162
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5163
        info isEmpty ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5164
            ('CVSSourceCodeManager [warning]: no status for ', fullName) errorPrintCR.
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5165
            ^ nil
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5166
        ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5167
    ] ensure:[
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5168
        inStream notNil ifTrue:[inStream close].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5169
        tempDir recursiveRemove
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5170
    ].
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5171
    ^ info
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5172
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5173
    "
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5174
     SourceCodeManager statusOf:Array 
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5175
     SourceCodeManager statusOf:Array fileName:'Array.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5176
     SourceCodeManager statusOf:Filename fileName:'Filename.st' directory:'libbasic' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5177
     SourceCodeManager statusOf:NewSystemBrowser fileName:'NewSystemBrowser.st' directory:'libtool' module:'stx'  
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5178
    "
1502
705913d4cae0 care for files in the Attic
Claus Gittinger <cg@exept.de>
parents: 1496
diff changeset
  5179
1778
5c84a32c9fe4 sourceCache organized as package-hierarchy to prevent
Claus Gittinger <cg@exept.de>
parents: 1736
diff changeset
  5180
    "Modified: / 29-08-2006 / 13:18:00 / cg"
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5181
! !
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5182
1526
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5183
!CVSSourceCodeManager class methodsFor:'testing'!
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5184
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5185
isCVS
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5186
    ^ true
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5187
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5188
    "Created: / 16-08-2006 / 10:58:19 / cg"
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5189
! !
7fd70c49ed6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1508
diff changeset
  5190
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5191
!CVSSourceCodeManager class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5192
2479
Claus Gittinger <cg@exept.de>
parents: 2478
diff changeset
  5193
version
3294
a3aa19619c3c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3292
diff changeset
  5194
    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.462 2013-06-06 20:17:54 cg Exp $'
2486
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5195
!
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5196
3c88b7c8f7fa changed: #checkinClass:fileName:directory:module:source:logMessage:force:
Claus Gittinger <cg@exept.de>
parents: 2483
diff changeset
  5197
version_CVS
3294
a3aa19619c3c class: CVSSourceCodeManager
Claus Gittinger <cg@exept.de>
parents: 3292
diff changeset
  5198
    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.462 2013-06-06 20:17:54 cg Exp $'
1362
Claus Gittinger <cg@exept.de>
parents: 1361
diff changeset
  5199
! !
1170
Claus Gittinger <cg@exept.de>
parents: 1159
diff changeset
  5200
3104
798c9c08083f class: CVSSourceCodeManager
Stefan Vogel <sv@exept.de>
parents: 2982
diff changeset
  5201
130
4abc831b165f oops - invalid ccheckin
Claus Gittinger <cg@exept.de>
parents: 129
diff changeset
  5202
CVSSourceCodeManager initialize!